Newznab to Yml

2026-03-21 17:14:08 -04:00 · 2022-12-17 17:53:37 -06:00
453 changed files with 10555 additions and 17349 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -117,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
@@ -162,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
@@ -178,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
@@ -189,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
@@ -227,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
@@ -254,7 +255,6 @@ 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

--- 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/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,13 +9,13 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.3.1'
+  majorVersion: '0.4.11'
  minorVersion: $[counter('minorVersion', 1)]
  prowlarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.405'
+  dotnetVersion: '6.0.301'
  innoVersion: '6.2.0'
  nodeVersion: '16.x'
  windowsImage: 'windows-2022'
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -39,7 +39,6 @@ module.exports = {
  plugins: [
    'filenames',
    'react',
-    'react-hooks',
    'simple-import-sort',
    'import'
  ],
@@ -309,9 +308,7 @@ 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: [
    {
--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -142,8 +142,8 @@ module.exports = (env) => {
    module: {
      rules: [
        {
-          test: /\.jsx?$/,
-          exclude: /[\\/]node_modules[\\/](?!(@sentry\/browser|@sentry\/integrations|chart.js|filesize|normalize.css)[\\/])/,
+          test: /\.js?$/,
+          exclude: /(node_modules|JsLibraries)/,
          use: [
            {
              loader: 'babel-loader',
--- 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/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/TagInputInput.js
+++ b/frontend/src/Components/Form/TagInputInput.js
@@ -36,6 +36,7 @@ class TagInputInput extends Component {
      <div
        ref={forwardedRef}
        className={className}
+        component="div"
        onMouseDown={this.onMouseDown}
      >
        {
--- a/frontend/src/Components/InfoLabel.css
+++ b/frontend/src/Components/InfoLabel.css
@@ -36,5 +36,5 @@
 /** Outline **/

 .outline {
-  background-color: var(--cardBackgroundColor);
+  background-color: var(--white);
 }
--- a/frontend/src/Components/Label.css
+++ b/frontend/src/Components/Label.css
@@ -108,5 +108,5 @@
 /** Outline **/

 .outline {
-  background-color: var(--cardBackgroundColor);
+  background-color: var(--white);
 }
--- a/frontend/src/Components/Modal/ConfirmModal.js
+++ b/frontend/src/Components/Modal/ConfirmModal.js
@@ -30,10 +30,10 @@ function ConfirmModal(props) {
  useEffect(() => {
    if (isOpen) {
      bindShortcut('enter', onConfirm);
-
-      return () => unbindShortcut('enter', onConfirm);
+    } else {
+      unbindShortcut('enter', onConfirm);
    }
-  }, [bindShortcut, unbindShortcut, isOpen, onConfirm]);
+  }, [onConfirm]);

  return (
    <Modal
--- a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.css
+++ b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.css
@@ -5,7 +5,7 @@
  text-align: center;

  &:hover {
-    color: #515253;
+    color: var(--toobarButtonHoverColor);
  }
 }

--- a/frontend/src/Components/Page/Page.js
+++ b/frontend/src/Components/Page/Page.js
@@ -4,7 +4,6 @@ import AppUpdatedModalConnector from 'App/AppUpdatedModalConnector';
 import ColorImpairedContext from 'App/ColorImpairedContext';
 import ConnectionLostModalConnector from 'App/ConnectionLostModalConnector';
 import SignalRConnector from 'Components/SignalRConnector';
-import AuthenticationRequiredModal from 'FirstRun/AuthenticationRequiredModal';
 import locationShape from 'Helpers/Props/Shapes/locationShape';
 import PageHeader from './Header/PageHeader';
 import PageSidebar from './Sidebar/PageSidebar';
@@ -76,7 +75,6 @@ class Page extends Component {
      isSmallScreen,
      isSidebarVisible,
      enableColorImpairedMode,
-      authenticationEnabled,
      onSidebarToggle,
      onSidebarVisibleChange
    } = this.props;
@@ -111,10 +109,6 @@ class Page extends Component {
            isOpen={this.state.isConnectionLostModalOpen}
            onModalClose={this.onConnectionLostModalClose}
          />
-
-          <AuthenticationRequiredModal
-            isOpen={!authenticationEnabled}
-          />
        </div>
      </ColorImpairedContext.Provider>
    );
@@ -130,7 +124,6 @@ Page.propTypes = {
  isUpdated: PropTypes.bool.isRequired,
  isDisconnected: PropTypes.bool.isRequired,
  enableColorImpairedMode: PropTypes.bool.isRequired,
-  authenticationEnabled: PropTypes.bool.isRequired,
  onResize: PropTypes.func.isRequired,
  onSidebarToggle: PropTypes.func.isRequired,
  onSidebarVisibleChange: PropTypes.func.isRequired
--- a/frontend/src/Components/Page/PageConnector.js
+++ b/frontend/src/Components/Page/PageConnector.js
@@ -11,7 +11,6 @@ import { fetchAppProfiles, fetchGeneralSettings, fetchIndexerCategories, fetchUI
 import { fetchStatus } from 'Store/Actions/systemActions';
 import { fetchTags } from 'Store/Actions/tagActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
-import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
 import ErrorPage from './ErrorPage';
 import LoadingPage from './LoadingPage';
 import Page from './Page';
@@ -134,21 +133,18 @@ function createMapStateToProps() {
    selectErrors,
    selectAppProps,
    createDimensionsSelector(),
-    createSystemStatusSelector(),
    (
      enableColorImpairedMode,
      isPopulated,
      errors,
      app,
-      dimensions,
-      systemStatus
+      dimensions
    ) => {
      return {
        ...app,
        ...errors,
        isPopulated,
        isSmallScreen: dimensions.isSmallScreen,
-        authenticationEnabled: systemStatus.authentication !== 'none',
        enableColorImpairedMode
      };
    }
--- a/frontend/src/FirstRun/AuthenticationRequiredModal.js
+++ b/frontend/src/FirstRun/AuthenticationRequiredModal.js
@@ -1,34 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
-import AuthenticationRequiredModalContentConnector from './AuthenticationRequiredModalContentConnector';
-
-function onModalClose() {
-  // No-op
-}
-
-function AuthenticationRequiredModal(props) {
-  const {
-    isOpen
-  } = props;
-
-  return (
-    <Modal
-      size={sizes.MEDIUM}
-      isOpen={isOpen}
-      closeOnBackgroundClick={false}
-      onModalClose={onModalClose}
-    >
-      <AuthenticationRequiredModalContentConnector
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-AuthenticationRequiredModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired
-};
-
-export default AuthenticationRequiredModal;
--- a/frontend/src/FirstRun/AuthenticationRequiredModalContent.css
+++ b/frontend/src/FirstRun/AuthenticationRequiredModalContent.css
@@ -1,5 +0,0 @@
-.authRequiredAlert {
-  composes: alert from '~Components/Alert.css';
-
-  margin-bottom: 20px;
-}
--- a/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
+++ b/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
@@ -1,165 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { useEffect, useRef } from 'react';
-import Alert from 'Components/Alert';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import SpinnerButton from 'Components/Link/SpinnerButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds } from 'Helpers/Props';
-import { authenticationMethodOptions, authenticationRequiredOptions, authenticationRequiredWarning } from 'Settings/General/SecuritySettings';
-import translate from 'Utilities/String/translate';
-import styles from './AuthenticationRequiredModalContent.css';
-
-function onModalClose() {
-  // No-op
-}
-
-function AuthenticationRequiredModalContent(props) {
-  const {
-    isPopulated,
-    error,
-    isSaving,
-    settings,
-    onInputChange,
-    onSavePress,
-    dispatchFetchStatus
-  } = props;
-
-  const {
-    authenticationMethod,
-    authenticationRequired,
-    username,
-    password
-  } = settings;
-
-  const authenticationEnabled = authenticationMethod && authenticationMethod.value !== 'none';
-
-  const didMount = useRef(false);
-
-  useEffect(() => {
-    if (!isSaving && didMount.current) {
-      dispatchFetchStatus();
-    }
-
-    didMount.current = true;
-  }, [isSaving, dispatchFetchStatus]);
-
-  return (
-    <ModalContent
-      showCloseButton={false}
-      onModalClose={onModalClose}
-    >
-      <ModalHeader>
-        {translate('AuthenticationRequired')}
-      </ModalHeader>
-
-      <ModalBody>
-        <Alert
-          className={styles.authRequiredAlert}
-          kind={kinds.WARNING}
-        >
-          {authenticationRequiredWarning}
-        </Alert>
-
-        {
-          isPopulated && !error ?
-            <div>
-              <FormGroup>
-                <FormLabel>{translate('Authentication')}</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.SELECT}
-                  name="authenticationMethod"
-                  values={authenticationMethodOptions}
-                  helpText={translate('AuthenticationMethodHelpText')}
-                  onChange={onInputChange}
-                  {...authenticationMethod}
-                />
-              </FormGroup>
-
-              {
-                authenticationEnabled ?
-                  <FormGroup>
-                    <FormLabel>{translate('AuthenticationRequired')}</FormLabel>
-
-                    <FormInputGroup
-                      type={inputTypes.SELECT}
-                      name="authenticationRequired"
-                      values={authenticationRequiredOptions}
-                      helpText={translate('AuthenticationRequiredHelpText')}
-                      onChange={onInputChange}
-                      {...authenticationRequired}
-                    />
-                  </FormGroup> :
-                  null
-              }
-
-              {
-                authenticationEnabled ?
-                  <FormGroup>
-                    <FormLabel>{translate('Username')}</FormLabel>
-
-                    <FormInputGroup
-                      type={inputTypes.TEXT}
-                      name="username"
-                      onChange={onInputChange}
-                      {...username}
-                    />
-                  </FormGroup> :
-                  null
-              }
-
-              {
-                authenticationEnabled ?
-                  <FormGroup>
-                    <FormLabel>{translate('Password')}</FormLabel>
-
-                    <FormInputGroup
-                      type={inputTypes.PASSWORD}
-                      name="password"
-                      onChange={onInputChange}
-                      {...password}
-                    />
-                  </FormGroup> :
-                  null
-              }
-            </div> :
-            null
-        }
-
-        {
-          !isPopulated && !error ? <LoadingIndicator /> : null
-        }
-      </ModalBody>
-
-      <ModalFooter>
-        <SpinnerButton
-          kind={kinds.PRIMARY}
-          isSpinning={isSaving}
-          isDisabled={!authenticationEnabled}
-          onPress={onSavePress}
-        >
-          {translate('Save')}
-        </SpinnerButton>
-      </ModalFooter>
-    </ModalContent>
-  );
-}
-
-AuthenticationRequiredModalContent.propTypes = {
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  isSaving: PropTypes.bool.isRequired,
-  saveError: PropTypes.object,
-  settings: PropTypes.object.isRequired,
-  onInputChange: PropTypes.func.isRequired,
-  onSavePress: PropTypes.func.isRequired,
-  dispatchFetchStatus: PropTypes.func.isRequired
-};
-
-export default AuthenticationRequiredModalContent;
--- a/frontend/src/FirstRun/AuthenticationRequiredModalContentConnector.js
+++ b/frontend/src/FirstRun/AuthenticationRequiredModalContentConnector.js
@@ -1,86 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { clearPendingChanges } from 'Store/Actions/baseActions';
-import { fetchGeneralSettings, saveGeneralSettings, setGeneralSettingsValue } from 'Store/Actions/settingsActions';
-import { fetchStatus } from 'Store/Actions/systemActions';
-import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector';
-import AuthenticationRequiredModalContent from './AuthenticationRequiredModalContent';
-
-const SECTION = 'general';
-
-function createMapStateToProps() {
-  return createSelector(
-    createSettingsSectionSelector(SECTION),
-    (sectionSettings) => {
-      return {
-        ...sectionSettings
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchClearPendingChanges: clearPendingChanges,
-  dispatchSetGeneralSettingsValue: setGeneralSettingsValue,
-  dispatchSaveGeneralSettings: saveGeneralSettings,
-  dispatchFetchGeneralSettings: fetchGeneralSettings,
-  dispatchFetchStatus: fetchStatus
-};
-
-class AuthenticationRequiredModalContentConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    this.props.dispatchFetchGeneralSettings();
-  }
-
-  componentWillUnmount() {
-    this.props.dispatchClearPendingChanges({ section: `settings.${SECTION}` });
-  }
-
-  //
-  // Listeners
-
-  onInputChange = ({ name, value }) => {
-    this.props.dispatchSetGeneralSettingsValue({ name, value });
-  };
-
-  onSavePress = () => {
-    this.props.dispatchSaveGeneralSettings();
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      dispatchClearPendingChanges,
-      dispatchFetchGeneralSettings,
-      dispatchSetGeneralSettingsValue,
-      dispatchSaveGeneralSettings,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <AuthenticationRequiredModalContent
-        {...otherProps}
-        onInputChange={this.onInputChange}
-        onSavePress={this.onSavePress}
-      />
-    );
-  }
-}
-
-AuthenticationRequiredModalContentConnector.propTypes = {
-  dispatchClearPendingChanges: PropTypes.func.isRequired,
-  dispatchFetchGeneralSettings: PropTypes.func.isRequired,
-  dispatchSetGeneralSettingsValue: PropTypes.func.isRequired,
-  dispatchSaveGeneralSettings: PropTypes.func.isRequired,
-  dispatchFetchStatus: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(AuthenticationRequiredModalContentConnector);
--- a/frontend/src/History/HistoryRow.js
+++ b/frontend/src/History/HistoryRow.js
@@ -226,42 +226,6 @@ class HistoryRow extends Component {
                      null
                  }

-                  {
-                    data.label ?
-                      <HistoryRowParameter
-                        title='Label'
-                        value={data.label}
-                      /> :
-                      null
-                  }
-
-                  {
-                    data.track ?
-                      <HistoryRowParameter
-                        title='Track'
-                        value={data.track}
-                      /> :
-                      null
-                  }
-
-                  {
-                    data.year ?
-                      <HistoryRowParameter
-                        title='Year'
-                        value={data.year}
-                      /> :
-                      null
-                  }
-
-                  {
-                    data.genre ?
-                      <HistoryRowParameter
-                        title='Genre'
-                        value={data.genre}
-                      /> :
-                      null
-                  }
-
                  {
                    data.author ?
                      <HistoryRowParameter
@@ -279,15 +243,6 @@ class HistoryRow extends Component {
                      /> :
                      null
                  }
-
-                  {
-                    data.publisher ?
-                      <HistoryRowParameter
-                        title='Publisher'
-                        value={data.publisher}
-                      /> :
-                      null
-                  }
                </TableRowCell>
              );
            }
--- a/frontend/src/Indexer/Add/AddIndexerModalContent.js
+++ b/frontend/src/Indexer/Add/AddIndexerModalContent.js
@@ -123,7 +123,7 @@ class AddIndexerModalContent extends Component {
    const filteredIndexers = indexers.filter((indexer) => {
      const { filter, filterProtocols, filterLanguages, filterPrivacyLevels } = this.state;

-      if (!indexer.name.toLowerCase().includes(filter.toLocaleLowerCase()) && !indexer.description.toLowerCase().includes(filter.toLocaleLowerCase())) {
+      if (!indexer.name.toLowerCase().includes(filter.toLocaleLowerCase())) {
        return false;
      }

--- a/frontend/src/Indexer/Editor/Tags/TagsModalContent.js
+++ b/frontend/src/Indexer/Editor/Tags/TagsModalContent.js
@@ -61,15 +61,15 @@ class TagsModalContent extends Component {
    } = this.state;

    const applyTagsOptions = [
-      { key: 'add', value: translate('Add') },
-      { key: 'remove', value: translate('Remove') },
-      { key: 'replace', value: translate('Replace') }
+      { key: 'add', value: 'Add' },
+      { key: 'remove', value: 'Remove' },
+      { key: 'replace', value: 'Replace' }
    ];

    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
-          {translate('Tags')}
+          Tags
        </ModalHeader>

        <ModalBody>
--- a/frontend/src/Indexer/Index/IndexerIndex.js
+++ b/frontend/src/Indexer/Index/IndexerIndex.js
@@ -272,7 +272,6 @@ class IndexerIndex extends Component {
      saveError,
      isDeleting,
      isTestingAll,
-      isSyncingIndexers,
      deleteError,
      onScroll,
      onSortSelect,
@@ -310,15 +309,6 @@ class IndexerIndex extends Component {
              onPress={this.onAddIndexerPress}
            />

-            <PageToolbarSeparator />
-
-            <PageToolbarButton
-              label={translate('SyncAppIndexers')}
-              iconName={icons.REFRESH}
-              isSpinning={isSyncingIndexers}
-              onPress={this.props.onAppIndexerSyncPress}
-            />
-
            <PageToolbarButton
              label={translate('TestAllIndexers')}
              iconName={icons.TEST}
@@ -503,12 +493,10 @@ IndexerIndex.propTypes = {
  saveError: PropTypes.object,
  isDeleting: PropTypes.bool.isRequired,
  isTestingAll: PropTypes.bool.isRequired,
-  isSyncingIndexers: PropTypes.bool.isRequired,
  deleteError: PropTypes.object,
  onSortSelect: PropTypes.func.isRequired,
  onFilterSelect: PropTypes.func.isRequired,
  onTestAllPress: PropTypes.func.isRequired,
-  onAppIndexerSyncPress: PropTypes.func.isRequired,
  onScroll: PropTypes.func.isRequired,
  onSaveSelected: PropTypes.func.isRequired
 };
--- a/frontend/src/Indexer/Index/IndexerIndexConnector.js
+++ b/frontend/src/Indexer/Index/IndexerIndexConnector.js
@@ -2,13 +2,10 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import * as commandNames from 'Commands/commandNames';
 import withScrollPosition from 'Components/withScrollPosition';
-import { executeCommand } from 'Store/Actions/commandActions';
 import { testAllIndexers } from 'Store/Actions/indexerActions';
 import { saveIndexerEditor, setMovieFilter, setMovieSort, setMovieTableOption } from 'Store/Actions/indexerIndexActions';
 import scrollPositions from 'Store/scrollPositions';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import createIndexerClientSideCollectionItemsSelector from 'Store/Selectors/createIndexerClientSideCollectionItemsSelector';
 import IndexerIndex from './IndexerIndex';
@@ -16,16 +13,13 @@ import IndexerIndex from './IndexerIndex';
 function createMapStateToProps() {
  return createSelector(
    createIndexerClientSideCollectionItemsSelector('indexerIndex'),
-    createCommandExecutingSelector(commandNames.APP_INDEXER_SYNC),
    createDimensionsSelector(),
    (
      indexers,
-      isSyncingIndexers,
      dimensionsState
    ) => {
      return {
        ...indexers,
-        isSyncingIndexers,
        isSmallScreen: dimensionsState.isSmallScreen
      };
    }
@@ -52,12 +46,6 @@ function createMapDispatchToProps(dispatch, props) {

    onTestAllPress() {
      dispatch(testAllIndexers());
-    },
-
-    onAppIndexerSyncPress() {
-      dispatch(executeCommand({
-        name: commandNames.APP_INDEXER_SYNC
-      }));
    }
  };
 }
--- a/frontend/src/Indexer/Index/Menus/IndexerIndexSortMenu.js
+++ b/frontend/src/Indexer/Index/Menus/IndexerIndexSortMenu.js
@@ -26,7 +26,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {translate('Status')}
+          Status
        </SortMenuItem>

        <SortMenuItem
@@ -62,7 +62,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {translate('Priority')}
+          {'Priority'}
        </SortMenuItem>

        <SortMenuItem
@@ -71,7 +71,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {translate('Protocol')}
+          {'Protocol'}
        </SortMenuItem>

        <SortMenuItem
@@ -80,7 +80,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {translate('Privacy')}
+          {'Privacy'}
        </SortMenuItem>
      </MenuContent>
    </SortMenu>
--- a/frontend/src/Indexer/Index/Table/CapabilitiesLabel.js
+++ b/frontend/src/Indexer/Index/Table/CapabilitiesLabel.js
@@ -14,7 +14,7 @@ function CapabilitiesLabel(props) {
  let filteredList = categories.filter((item) => item.id < 100000);

  if (categoryFilter.length > 0) {
-    filteredList = filteredList.filter((item) => categoryFilter.includes(item.id) || (item.subCategories && item.subCategories.some((r) => categoryFilter.includes(r.id))));
+    filteredList = filteredList.filter((item) => categoryFilter.includes(item.id));
  }

  const nameList = filteredList.map((item) => item.name).sort();
--- a/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
+++ b/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
@@ -79,7 +79,6 @@ class IndexerIndexRow extends Component {
      privacy,
      priority,
      status,
-      fields,
      appProfile,
      added,
      capabilities,
@@ -97,8 +96,6 @@ class IndexerIndexRow extends Component {
      isIndexerInfoModalOpen
    } = this.state;

-    const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? (Array.isArray(indexerUrls) ? indexerUrls[0] : undefined);
-
    return (
      <>
        {
@@ -248,12 +245,12 @@ class IndexerIndexRow extends Component {
                  />

                  {
-                    baseUrl ?
+                    indexerUrls ?
                      <IconButton
                        className={styles.externalLink}
                        name={icons.EXTERNAL_LINK}
                        title={translate('Website')}
-                        to={baseUrl.replace(/(:\/\/)api\./, '$1')}
+                        to={indexerUrls[0].replace('api.', '')}
                      /> : null
                  }

@@ -302,7 +299,6 @@ IndexerIndexRow.propTypes = {
  name: PropTypes.string.isRequired,
  enable: PropTypes.bool.isRequired,
  redirect: PropTypes.bool.isRequired,
-  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
  appProfile: PropTypes.object.isRequired,
  status: PropTypes.object,
  capabilities: PropTypes.object,
--- a/frontend/src/Indexer/Info/IndexerInfoModalContent.js
+++ b/frontend/src/Indexer/Info/IndexerInfoModalContent.js
@@ -20,14 +20,11 @@ function IndexerInfoModalContent(props) {
    encoding,
    language,
    indexerUrls,
-    fields,
    protocol,
    capabilities,
    onModalClose
  } = props;

-  const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? indexerUrls[0];
-
  return (
    <ModalContent onModalClose={onModalClose}>
      <ModalHeader>
@@ -60,7 +57,7 @@ function IndexerInfoModalContent(props) {
              />
              <DescriptionListItemTitle>{translate('IndexerSite')}</DescriptionListItemTitle>
              <DescriptionListItemDescription>
-                <Link to={baseUrl}>{baseUrl}</Link>
+                <Link to={indexerUrls[0]}>{indexerUrls[0]}</Link>
              </DescriptionListItemDescription>
              <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
              <DescriptionListItemDescription>
@@ -117,7 +114,6 @@ IndexerInfoModalContent.propTypes = {
  encoding: PropTypes.string.isRequired,
  language: PropTypes.string.isRequired,
  indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
-  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
  protocol: PropTypes.string.isRequired,
  capabilities: PropTypes.object.isRequired,
  onModalClose: PropTypes.func.isRequired
--- a/frontend/src/Search/Mobile/SearchIndexOverview.css
+++ b/frontend/src/Search/Mobile/SearchIndexOverview.css
@@ -1,49 +0,0 @@
-$hoverScale: 1.05;
-
-.content {
-  display: flex;
-  flex-grow: 0;
-  margin-left: 5px;
-}
-
-.container {
-  border-radius: 4px;
-  background-color: var(--cardBackgroundColor);
-}
-
-.info {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  overflow: hidden;
-}
-
-.titleRow {
-  display: flex;
-  justify-content: space-between;
-  flex: 0 0 auto;
-  margin-bottom: 10px;
-  height: 38px;
-}
-
-.indexerRow {
-  color: var(--disabledColor);
-}
-
-.infoRow {
-  margin-bottom: 5px;
-}
-
-.title {
-  overflow: hidden;
-  width: 85%;
-  font-weight: 500;
-  font-size: 14px;
-  overflow-wrap: break-word;
-}
-
-.actions {
-  position: absolute;
-  right: 0;
-  white-space: nowrap;
-}
--- a/frontend/src/Search/Mobile/SearchIndexOverview.js
+++ b/frontend/src/Search/Mobile/SearchIndexOverview.js
@@ -1,202 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import TextTruncate from 'react-text-truncate';
-import Label from 'Components/Label';
-import IconButton from 'Components/Link/IconButton';
-import Link from 'Components/Link/Link';
-import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
-import { icons, kinds } from 'Helpers/Props';
-import CategoryLabel from 'Search/Table/CategoryLabel';
-import Peers from 'Search/Table/Peers';
-import ProtocolLabel from 'Search/Table/ProtocolLabel';
-import dimensions from 'Styles/Variables/dimensions';
-import formatAge from 'Utilities/Number/formatAge';
-import formatBytes from 'Utilities/Number/formatBytes';
-import translate from 'Utilities/String/translate';
-import styles from './SearchIndexOverview.css';
-
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
-
-function getContentHeight(rowHeight, isSmallScreen) {
-  const padding = isSmallScreen ? columnPaddingSmallScreen : columnPadding;
-
-  return rowHeight - padding;
-}
-
-function getDownloadIcon(isGrabbing, isGrabbed, grabError) {
-  if (isGrabbing) {
-    return icons.SPINNER;
-  } else if (isGrabbed) {
-    return icons.DOWNLOADING;
-  } else if (grabError) {
-    return icons.DOWNLOADING;
-  }
-
-  return icons.DOWNLOAD;
-}
-
-function getDownloadTooltip(isGrabbing, isGrabbed, grabError) {
-  if (isGrabbing) {
-    return '';
-  } else if (isGrabbed) {
-    return translate('AddedToDownloadClient');
-  } else if (grabError) {
-    return grabError;
-  }
-
-  return translate('AddToDownloadClient');
-}
-
-class SearchIndexOverview extends Component {
-
-  //
-  // Listeners
-
-  onGrabPress = () => {
-    const {
-      guid,
-      indexerId,
-      onGrabPress
-    } = this.props;
-
-    onGrabPress({
-      guid,
-      indexerId
-    });
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      title,
-      infoUrl,
-      protocol,
-      downloadUrl,
-      categories,
-      seeders,
-      leechers,
-      size,
-      age,
-      ageHours,
-      ageMinutes,
-      indexer,
-      rowHeight,
-      isSmallScreen,
-      isGrabbed,
-      isGrabbing,
-      grabError
-    } = this.props;
-
-    const contentHeight = getContentHeight(rowHeight, isSmallScreen);
-
-    return (
-      <div className={styles.container}>
-        <div className={styles.content}>
-          <div className={styles.info} style={{ height: contentHeight }}>
-            <div className={styles.titleRow}>
-              <div className={styles.title}>
-                <Link
-                  to={infoUrl}
-                  title={title}
-                >
-                  <TextTruncate
-                    line={2}
-                    text={title}
-                  />
-                </Link>
-
-              </div>
-
-              <div className={styles.actions}>
-                <SpinnerIconButton
-                  name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
-                  kind={grabError ? kinds.DANGER : kinds.DEFAULT}
-                  title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
-                  isDisabled={isGrabbed}
-                  isSpinning={isGrabbing}
-                  onPress={this.onGrabPress}
-                />
-
-                <IconButton
-                  className={styles.downloadLink}
-                  name={icons.SAVE}
-                  title={translate('Save')}
-                  to={downloadUrl}
-                />
-              </div>
-            </div>
-            <div className={styles.indexerRow}>
-              {indexer}
-            </div>
-            <div className={styles.infoRow}>
-              <ProtocolLabel
-                protocol={protocol}
-              />
-
-              {
-                protocol === 'torrent' &&
-                  <Peers
-                    seeders={seeders}
-                    leechers={leechers}
-                  />
-              }
-
-              <Label>
-                {formatBytes(size)}
-              </Label>
-
-              <Label>
-                {formatAge(age, ageHours, ageMinutes)}
-              </Label>
-
-              <CategoryLabel
-                categories={categories}
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-SearchIndexOverview.propTypes = {
-  guid: PropTypes.string.isRequired,
-  categories: PropTypes.arrayOf(PropTypes.object).isRequired,
-  protocol: PropTypes.string.isRequired,
-  age: PropTypes.number.isRequired,
-  ageHours: PropTypes.number.isRequired,
-  ageMinutes: PropTypes.number.isRequired,
-  publishDate: PropTypes.string.isRequired,
-  title: PropTypes.string.isRequired,
-  infoUrl: PropTypes.string.isRequired,
-  downloadUrl: PropTypes.string.isRequired,
-  indexerId: PropTypes.number.isRequired,
-  indexer: PropTypes.string.isRequired,
-  size: PropTypes.number.isRequired,
-  files: PropTypes.number,
-  grabs: PropTypes.number,
-  seeders: PropTypes.number,
-  leechers: PropTypes.number,
-  indexerFlags: PropTypes.arrayOf(PropTypes.string).isRequired,
-  rowHeight: PropTypes.number.isRequired,
-  showRelativeDates: PropTypes.bool.isRequired,
-  shortDateFormat: PropTypes.string.isRequired,
-  longDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  isSmallScreen: PropTypes.bool.isRequired,
-  onGrabPress: PropTypes.func.isRequired,
-  isGrabbing: PropTypes.bool.isRequired,
-  isGrabbed: PropTypes.bool.isRequired,
-  grabError: PropTypes.string
-};
-
-SearchIndexOverview.defaultProps = {
-  isGrabbing: false,
-  isGrabbed: false
-};
-
-export default SearchIndexOverview;
--- a/frontend/src/Search/Mobile/SearchIndexOverviews.css
+++ b/frontend/src/Search/Mobile/SearchIndexOverviews.css
@@ -1,11 +0,0 @@
-.grid {
-  flex: 1 0 auto;
-}
-
-.container {
-  &:hover {
-    .content {
-      background-color: var(--tableRowHoverBackgroundColor);
-    }
-  }
-}
--- a/frontend/src/Search/Mobile/SearchIndexOverviews.js
+++ b/frontend/src/Search/Mobile/SearchIndexOverviews.js
@@ -1,209 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { Grid, WindowScroller } from 'react-virtualized';
-import Measure from 'Components/Measure';
-import SearchIndexItemConnector from 'Search/Table/SearchIndexItemConnector';
-import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter';
-import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder';
-import SearchIndexOverview from './SearchIndexOverview';
-import styles from './SearchIndexOverviews.css';
-
-class SearchIndexOverviews extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      width: 0,
-      columnCount: 1,
-      rowHeight: 100,
-      scrollRestored: false
-    };
-
-    this._grid = null;
-  }
-
-  componentDidUpdate(prevProps, prevState) {
-    const {
-      items,
-      sortKey,
-      jumpToCharacter,
-      scrollTop,
-      isSmallScreen
-    } = this.props;
-
-    const {
-      width,
-      rowHeight,
-      scrollRestored
-    } = this.state;
-
-    if (prevProps.sortKey !== sortKey) {
-      this.calculateGrid(this.state.width, isSmallScreen);
-    }
-
-    if (
-      this._grid &&
-        (prevState.width !== width ||
-            prevState.rowHeight !== rowHeight ||
-            hasDifferentItemsOrOrder(prevProps.items, items, 'guid')
-        )
-    ) {
-      // recomputeGridSize also forces Grid to discard its cache of rendered cells
-      this._grid.recomputeGridSize();
-    }
-
-    if (this._grid && scrollTop !== 0 && !scrollRestored) {
-      this.setState({ scrollRestored: true });
-      this._grid.scrollToPosition({ scrollTop });
-    }
-
-    if (jumpToCharacter != null && jumpToCharacter !== prevProps.jumpToCharacter) {
-      const index = getIndexOfFirstCharacter(items, jumpToCharacter);
-
-      if (this._grid && index != null) {
-
-        this._grid.scrollToCell({
-          rowIndex: index,
-          columnIndex: 0
-        });
-      }
-    }
-  }
-
-  //
-  // Control
-
-  setGridRef = (ref) => {
-    this._grid = ref;
-  };
-
-  calculateGrid = (width = this.state.width, isSmallScreen) => {
-    const rowHeight = 100;
-
-    this.setState({
-      width,
-      rowHeight
-    });
-  };
-
-  cellRenderer = ({ key, rowIndex, style }) => {
-    const {
-      items,
-      showRelativeDates,
-      shortDateFormat,
-      longDateFormat,
-      timeFormat,
-      isSmallScreen,
-      onGrabPress
-    } = this.props;
-
-    const {
-      rowHeight
-    } = this.state;
-
-    const release = items[rowIndex];
-
-    return (
-      <div
-        className={styles.container}
-        key={key}
-        style={style}
-      >
-        <SearchIndexItemConnector
-          key={release.guid}
-          component={SearchIndexOverview}
-          rowHeight={rowHeight}
-          showRelativeDates={showRelativeDates}
-          shortDateFormat={shortDateFormat}
-          longDateFormat={longDateFormat}
-          timeFormat={timeFormat}
-          isSmallScreen={isSmallScreen}
-          style={style}
-          guid={release.guid}
-          onGrabPress={onGrabPress}
-        />
-      </div>
-    );
-  };
-
-  //
-  // Listeners
-
-  onMeasure = ({ width }) => {
-    this.calculateGrid(width, this.props.isSmallScreen);
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      items
-    } = this.props;
-
-    const {
-      width,
-      rowHeight
-    } = this.state;
-
-    return (
-      <Measure
-        whitelist={['width']}
-        onMeasure={this.onMeasure}
-      >
-        <WindowScroller
-          scrollElement={undefined}
-        >
-          {({ height, registerChild, onChildScroll, scrollTop }) => {
-            if (!height) {
-              return <div />;
-            }
-
-            return (
-              <div ref={registerChild}>
-                <Grid
-                  ref={this.setGridRef}
-                  className={styles.grid}
-                  autoHeight={true}
-                  height={height}
-                  columnCount={1}
-                  columnWidth={width}
-                  rowCount={items.length}
-                  rowHeight={rowHeight}
-                  width={width}
-                  onScroll={onChildScroll}
-                  scrollTop={scrollTop}
-                  overscanRowCount={2}
-                  cellRenderer={this.cellRenderer}
-                  scrollToAlignment={'start'}
-                  isScrollingOptOut={true}
-                />
-              </div>
-            );
-          }
-          }
-        </WindowScroller>
-      </Measure>
-    );
-  }
-}
-
-SearchIndexOverviews.propTypes = {
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  sortKey: PropTypes.string,
-  scrollTop: PropTypes.number.isRequired,
-  jumpToCharacter: PropTypes.string,
-  scroller: PropTypes.instanceOf(Element).isRequired,
-  showRelativeDates: PropTypes.bool.isRequired,
-  shortDateFormat: PropTypes.string.isRequired,
-  longDateFormat: PropTypes.string.isRequired,
-  isSmallScreen: PropTypes.bool.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  onGrabPress: PropTypes.func.isRequired
-};
-
-export default SearchIndexOverviews;
--- a/frontend/src/Search/Mobile/SearchIndexOverviewsConnector.js
+++ b/frontend/src/Search/Mobile/SearchIndexOverviewsConnector.js
@@ -1,32 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { grabRelease } from 'Store/Actions/releaseActions';
-import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import SearchIndexOverviews from './SearchIndexOverviews';
-
-function createMapStateToProps() {
-  return createSelector(
-    createUISettingsSelector(),
-    createDimensionsSelector(),
-    (uiSettings, dimensions) => {
-      return {
-        showRelativeDates: uiSettings.showRelativeDates,
-        shortDateFormat: uiSettings.shortDateFormat,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat,
-        isSmallScreen: dimensions.isSmallScreen
-      };
-    }
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    onGrabPress(payload) {
-      dispatch(grabRelease(payload));
-    }
-  };
-}
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(SearchIndexOverviews);
--- a/frontend/src/Search/SearchIndex.js
+++ b/frontend/src/Search/SearchIndex.js
@@ -11,6 +11,8 @@ import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import { align, icons, sortDirections } from 'Helpers/Props';
+import AddIndexerModal from 'Indexer/Add/AddIndexerModal';
+import EditIndexerModalConnector from 'Indexer/Edit/EditIndexerModalConnector';
 import NoIndexer from 'Indexer/NoIndexer';
 import * as keyCodes from 'Utilities/Constants/keyCodes';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
@@ -21,17 +23,12 @@ import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
 import SearchIndexFilterMenu from './Menus/SearchIndexFilterMenu';
 import SearchIndexSortMenu from './Menus/SearchIndexSortMenu';
-import SearchIndexOverviewsConnector from './Mobile/SearchIndexOverviewsConnector';
 import NoSearchResults from './NoSearchResults';
 import SearchFooterConnector from './SearchFooterConnector';
 import SearchIndexTableConnector from './Table/SearchIndexTableConnector';
 import styles from './SearchIndex.css';

-function getViewComponent(isSmallScreen) {
-  if (isSmallScreen) {
-    return SearchIndexOverviewsConnector;
-  }
-
+function getViewComponent() {
  return SearchIndexTableConnector;
 }

@@ -47,6 +44,8 @@ class SearchIndex extends Component {
      scroller: null,
      jumpBarItems: { order: [] },
      jumpToCharacter: null,
+      isAddIndexerModalOpen: false,
+      isEditIndexerModalOpen: false,
      searchType: null,
      lastToggled: null,
      allSelected: false,
@@ -178,6 +177,21 @@ class SearchIndex extends Component {
  //
  // Listeners

+  onAddIndexerPress = () => {
+    this.setState({ isAddIndexerModalOpen: true });
+  };
+
+  onAddIndexerModalClose = ({ indexerSelected = false } = {}) => {
+    this.setState({
+      isAddIndexerModalOpen: false,
+      isEditIndexerModalOpen: indexerSelected
+    });
+  };
+
+  onEditIndexerModalClose = () => {
+    this.setState({ isEditIndexerModalOpen: false });
+  };
+
  onJumpBarItemPress = (jumpToCharacter) => {
    this.setState({ jumpToCharacter });
  };
@@ -239,7 +253,6 @@ class SearchIndex extends Component {
      onScroll,
      onSortSelect,
      onFilterSelect,
-      isSmallScreen,
      hasIndexers,
      ...otherProps
    } = this.props;
@@ -247,6 +260,8 @@ class SearchIndex extends Component {
    const {
      scroller,
      jumpBarItems,
+      isAddIndexerModalOpen,
+      isEditIndexerModalOpen,
      jumpToCharacter,
      selectedState,
      allSelected,
@@ -255,7 +270,7 @@ class SearchIndex extends Component {

    const selectedIndexerIds = this.getSelectedIds();

-    const ViewComponent = getViewComponent(isSmallScreen);
+    const ViewComponent = getViewComponent();
    const isLoaded = !!(!error && isPopulated && items.length && scroller);
    const hasNoIndexer = !totalItems;

@@ -369,6 +384,16 @@ class SearchIndex extends Component {
          onSearchPress={this.onSearchPress}
          onBulkGrabPress={this.onBulkGrabPress}
        />
+
+        <AddIndexerModal
+          isOpen={isAddIndexerModalOpen}
+          onModalClose={this.onAddIndexerModalClose}
+        />
+
+        <EditIndexerModalConnector
+          isOpen={isEditIndexerModalOpen}
+          onModalClose={this.onEditIndexerModalClose}
+        />
      </PageContent>
    );
  }
--- a/frontend/src/Search/Table/SearchIndexHeader.css
+++ b/frontend/src/Search/Table/SearchIndexHeader.css
@@ -14,7 +14,7 @@
 .category {
  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

-  flex: 0 0 130px;
+  flex: 0 0 110px;
 }

 .age,
--- a/frontend/src/Search/Table/SearchIndexItemConnector.js
+++ b/frontend/src/Search/Table/SearchIndexItemConnector.js
@@ -18,20 +18,20 @@ function createMapStateToProps() {
  return createSelector(
    createReleaseSelector(),
    (
-      release
+      movie
    ) => {

-      // If a release is deleted this selector may fire before the parent
-      // selecors, which will result in an undefined release, if that happens
+      // If a movie is deleted this selector may fire before the parent
+      // selecors, which will result in an undefined movie, if that happens
      // we want to return early here and again in the render function to avoid
-      // trying to show a release that has no information available.
+      // trying to show a movie that has no information available.

-      if (!release) {
+      if (!movie) {
        return {};
      }

      return {
-        ...release
+        ...movie
      };
    }
  );
@@ -41,7 +41,7 @@ const mapDispatchToProps = {
  dispatchExecuteCommand: executeCommand
 };

-class SearchIndexItemConnector extends Component {
+class MovieIndexItemConnector extends Component {

  //
  // Render
@@ -66,9 +66,9 @@ class SearchIndexItemConnector extends Component {
  }
 }

-SearchIndexItemConnector.propTypes = {
+MovieIndexItemConnector.propTypes = {
  guid: PropTypes.string,
  component: PropTypes.elementType.isRequired
 };

-export default connect(createMapStateToProps, mapDispatchToProps)(SearchIndexItemConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(MovieIndexItemConnector);
--- a/frontend/src/Search/Table/SearchIndexRow.css
+++ b/frontend/src/Search/Table/SearchIndexRow.css
@@ -21,7 +21,7 @@
 .category {
  composes: cell;

-  flex: 0 0 130px;
+  flex: 0 0 110px;
 }

 .age,
--- a/frontend/src/Search/Table/SearchIndexRow.js
+++ b/frontend/src/Search/Table/SearchIndexRow.js
@@ -71,19 +71,6 @@ class SearchIndexRow extends Component {
    });
  };

-  onSavePress = () => {
-    const {
-      downloadUrl,
-      fileName,
-      onSavePress
-    } = this.props;
-
-    onSavePress({
-      downloadUrl,
-      fileName
-    });
-  };
-
  //
  // Render

@@ -98,6 +85,7 @@ class SearchIndexRow extends Component {
      publishDate,
      title,
      infoUrl,
+      downloadUrl,
      indexer,
      size,
      files,
@@ -312,7 +300,7 @@ class SearchIndexRow extends Component {
                    className={styles.downloadLink}
                    name={icons.SAVE}
                    title={translate('Save')}
-                    onPress={this.onSavePress}
+                    to={downloadUrl}
                  />
                </VirtualTableRowCell>
              );
@@ -335,7 +323,6 @@ SearchIndexRow.propTypes = {
  ageMinutes: PropTypes.number.isRequired,
  publishDate: PropTypes.string.isRequired,
  title: PropTypes.string.isRequired,
-  fileName: PropTypes.string.isRequired,
  infoUrl: PropTypes.string.isRequired,
  downloadUrl: PropTypes.string.isRequired,
  indexerId: PropTypes.number.isRequired,
@@ -348,7 +335,6 @@ SearchIndexRow.propTypes = {
  indexerFlags: PropTypes.arrayOf(PropTypes.string).isRequired,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  onGrabPress: PropTypes.func.isRequired,
-  onSavePress: PropTypes.func.isRequired,
  isGrabbing: PropTypes.bool.isRequired,
  isGrabbed: PropTypes.bool.isRequired,
  grabError: PropTypes.string,
--- a/frontend/src/Search/Table/SearchIndexTable.js
+++ b/frontend/src/Search/Table/SearchIndexTable.js
@@ -51,8 +51,7 @@ class SearchIndexTable extends Component {
      timeFormat,
      selectedState,
      onSelectedChange,
-      onGrabPress,
-      onSavePress
+      onGrabPress
    } = this.props;

    const release = items[rowIndex];
@@ -72,7 +71,6 @@ class SearchIndexTable extends Component {
          longDateFormat={longDateFormat}
          timeFormat={timeFormat}
          onGrabPress={onGrabPress}
-          onSavePress={onSavePress}
        />
      </VirtualTableRow>
    );
@@ -136,7 +134,6 @@ SearchIndexTable.propTypes = {
  timeFormat: PropTypes.string.isRequired,
  onSortPress: PropTypes.func.isRequired,
  onGrabPress: PropTypes.func.isRequired,
-  onSavePress: PropTypes.func.isRequired,
  allSelected: PropTypes.bool.isRequired,
  allUnselected: PropTypes.bool.isRequired,
  selectedState: PropTypes.object.isRequired,
--- a/frontend/src/Search/Table/SearchIndexTableConnector.js
+++ b/frontend/src/Search/Table/SearchIndexTableConnector.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { grabRelease, saveRelease, setReleasesSort } from 'Store/Actions/releaseActions';
+import { grabRelease, setReleasesSort } from 'Store/Actions/releaseActions';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import SearchIndexTable from './SearchIndexTable';

@@ -25,9 +25,6 @@ function createMapDispatchToProps(dispatch, props) {
    },
    onGrabPress(payload) {
      dispatch(grabRelease(payload));
-    },
-    onSavePress(payload) {
-      dispatch(saveRelease(payload));
    }
  };
 }
--- a/frontend/src/Settings/Applications/Applications/AddApplicationModalContent.js
+++ b/frontend/src/Settings/Applications/Applications/AddApplicationModalContent.js
@@ -28,7 +28,7 @@ class AddApplicationModalContent extends Component {
    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
-          {translate('AddApplication')}
+          Add Application
        </ModalHeader>

        <ModalBody>
--- a/frontend/src/Settings/Applications/Applications/Application.js
+++ b/frontend/src/Settings/Applications/Applications/Application.js
@@ -71,14 +71,14 @@ class Application extends Component {
        {
          syncLevel === 'addOnly' &&
            <Label kind={kinds.WARNING}>
-              {translate('AddRemoveOnly')}
+              Add and Remove Only
            </Label>
        }

        {
          syncLevel === 'fullSync' &&
            <Label kind={kinds.SUCCESS}>
-              {translate('FullSync')}
+              Full Sync
            </Label>
        }

@@ -88,7 +88,7 @@ class Application extends Component {
              kind={kinds.DISABLED}
              outline={true}
            >
-              {translate('Disabled')}
+              Disabled
            </Label>
        }

--- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
@@ -81,6 +81,8 @@ class EditDownloadClientModalContent extends Component {
      message
    } = item;

+    console.log(supportsCategories);
+
    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
--- a/frontend/src/Settings/General/SecuritySettings.js
+++ b/frontend/src/Settings/General/SecuritySettings.js
@@ -11,20 +11,12 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
 import { icons, inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';

-export const authenticationRequiredWarning = translate('AuthenticationRequiredWarning');
-
-export const authenticationMethodOptions = [
-  { key: 'none', value: 'None', isDisabled: true },
-  { key: 'external', value: 'External', isHidden: true },
+const authenticationMethodOptions = [
+  { key: 'none', value: 'None' },
  { key: 'basic', value: 'Basic (Browser Popup)' },
  { key: 'forms', value: 'Forms (Login Page)' }
 ];

-export const authenticationRequiredOptions = [
-  { key: 'enabled', value: 'Enabled' },
-  { key: 'disabledForLocalAddresses', value: 'Disabled for Local Addresses' }
-];
-
 const certificateValidationOptions = [
  { key: 'enabled', value: 'Enabled' },
  { key: 'disabledForLocalAddresses', value: 'Disabled for Local Addresses' },
@@ -76,7 +68,6 @@ class SecuritySettings extends Component {

    const {
      authenticationMethod,
-      authenticationRequired,
      username,
      password,
      apiKey,
@@ -95,31 +86,13 @@ class SecuritySettings extends Component {
            name="authenticationMethod"
            values={authenticationMethodOptions}
            helpText={translate('AuthenticationMethodHelpText')}
-            helpTextWarning={authenticationRequiredWarning}
            onChange={onInputChange}
            {...authenticationMethod}
          />
        </FormGroup>

        {
-          authenticationEnabled ?
-            <FormGroup>
-              <FormLabel>{translate('AuthenticationRequired')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.SELECT}
-                name="authenticationRequired"
-                values={authenticationRequiredOptions}
-                helpText={translate('AuthenticationRequiredHelpText')}
-                onChange={onInputChange}
-                {...authenticationRequired}
-              />
-            </FormGroup> :
-            null
-        }
-
-        {
-          authenticationEnabled ?
+          authenticationEnabled &&
            <FormGroup>
              <FormLabel>{translate('Username')}</FormLabel>

@@ -129,12 +102,11 @@ class SecuritySettings extends Component {
                onChange={onInputChange}
                {...username}
              />
-            </FormGroup> :
-            null
+            </FormGroup>
        }

        {
-          authenticationEnabled ?
+          authenticationEnabled &&
            <FormGroup>
              <FormLabel>{translate('Password')}</FormLabel>

@@ -144,8 +116,7 @@ class SecuritySettings extends Component {
                onChange={onInputChange}
                {...password}
              />
-            </FormGroup> :
-            null
+            </FormGroup>
        }

        <FormGroup>
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js
@@ -106,7 +106,7 @@ class IndexerProxy extends Component {
              kind={kinds.DISABLED}
              outline={true}
            >
-              {translate('Disabled')}
+              Disabled
            </Label> :
            null
        }
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -56,9 +56,17 @@ class Notification extends Component {
      id,
      name,
      onGrab,
+      onDownload,
+      onUpgrade,
+      onRename,
+      onDelete,
      onHealthIssue,
      onApplicationUpdate,
      supportsOnGrab,
+      supportsOnDownload,
+      supportsOnUpgrade,
+      supportsOnRename,
+      supportsOnDelete,
      supportsOnHealthIssue,
      supportsOnApplicationUpdate
    } = this.props;
@@ -80,6 +88,34 @@ class Notification extends Component {
            </Label>
        }

+        {
+          supportsOnDelete && onDelete &&
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnDelete')}
+            </Label>
+        }
+
+        {
+          supportsOnDownload && onDownload &&
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnImport')}
+            </Label>
+        }
+
+        {
+          supportsOnUpgrade && onDownload && onUpgrade &&
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnUpgrade')}
+            </Label>
+        }
+
+        {
+          supportsOnRename && onRename &&
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnRename')}
+            </Label>
+        }
+
        {
          supportsOnHealthIssue && onHealthIssue &&
            <Label kind={kinds.SUCCESS}>
@@ -96,7 +132,7 @@ class Notification extends Component {
        }

        {
-          !onGrab && !onHealthIssue && !onApplicationUpdate ?
+          !onGrab && !onDownload && !onRename && !onHealthIssue && !onDelete && !onApplicationUpdate ?
            <Label
              kind={kinds.DISABLED}
              outline={true}
@@ -131,9 +167,17 @@ Notification.propTypes = {
  id: PropTypes.number.isRequired,
  name: PropTypes.string.isRequired,
  onGrab: PropTypes.bool.isRequired,
+  onDownload: PropTypes.bool.isRequired,
+  onUpgrade: PropTypes.bool.isRequired,
+  onRename: PropTypes.bool.isRequired,
+  onDelete: PropTypes.bool.isRequired,
  onHealthIssue: PropTypes.bool.isRequired,
  onApplicationUpdate: PropTypes.bool.isRequired,
  supportsOnGrab: PropTypes.bool.isRequired,
+  supportsOnDownload: PropTypes.bool.isRequired,
+  supportsOnDelete: PropTypes.bool.isRequired,
+  supportsOnUpgrade: PropTypes.bool.isRequired,
+  supportsOnRename: PropTypes.bool.isRequired,
  supportsOnHealthIssue: PropTypes.bool.isRequired,
  supportsOnApplicationUpdate: PropTypes.bool.isRequired,
  onConfirmDeleteNotification: PropTypes.func.isRequired
--- a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
+++ b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
@@ -15,11 +15,8 @@ function NotificationEventItems(props) {
  } = props;

  const {
-    onGrab,
    onHealthIssue,
    onApplicationUpdate,
-    supportsOnGrab,
-    includeManualGrabs,
    supportsOnHealthIssue,
    includeHealthWarnings,
    supportsOnApplicationUpdate
@@ -34,31 +31,6 @@ function NotificationEventItems(props) {
          link="https://wiki.servarr.com/prowlarr/settings#connections"
        />
        <div className={styles.events}>
-          <div>
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="onGrab"
-              helpText={translate('OnGrabHelpText')}
-              isDisabled={!supportsOnGrab.value}
-              {...onGrab}
-              onChange={onInputChange}
-            />
-          </div>
-
-          {
-            onGrab.value &&
-              <div>
-                <FormInputGroup
-                  type={inputTypes.CHECK}
-                  name="includeManualGrabs"
-                  helpText={translate('IncludeManualGrabsHelpText')}
-                  isDisabled={!supportsOnGrab.value}
-                  {...includeManualGrabs}
-                  onChange={onInputChange}
-                />
-              </div>
-          }
-
          <div>
            <FormInputGroup
              type={inputTypes.CHECK}
--- a/frontend/src/Settings/PendingChangesModal.js
+++ b/frontend/src/Settings/PendingChangesModal.js
@@ -20,7 +20,7 @@ function PendingChangesModal(props) {

  useEffect(() => {
    bindShortcut('enter', onConfirm);
-  }, [bindShortcut, onConfirm]);
+  }, [onConfirm]);

  return (
    <Modal
--- a/frontend/src/Settings/UI/UISettingsConnector.js
+++ b/frontend/src/Settings/UI/UISettingsConnector.js
@@ -14,6 +14,8 @@ function createLanguagesSelector() {
  return createSelector(
    (state) => state.localization,
    (localization) => {
+      console.log(localization);
+
      const items = localization.items;

      if (!items) {
--- a/frontend/src/Store/Actions/Settings/downloadClientCategories.js
+++ b/frontend/src/Store/Actions/Settings/downloadClientCategories.js
@@ -113,6 +113,8 @@ export default {

      const saveData = getProviderState({ id, ...otherPayload }, getState, section, false);

+      console.log(saveData);
+
      // we have to set id since not actually posting to server yet
      if (!saveData.id) {
        saveData.id = getNextId(getState().settings.downloadClientCategories.items);
--- a/frontend/src/Store/Actions/Settings/notifications.js
+++ b/frontend/src/Store/Actions/Settings/notifications.js
@@ -103,6 +103,9 @@ export default {
    [SELECT_NOTIFICATION_SCHEMA]: (state, { payload }) => {
      return selectProviderSchema(state, section, payload, (selectedSchema) => {
        selectedSchema.onGrab = selectedSchema.supportsOnGrab;
+        selectedSchema.onDownload = selectedSchema.supportsOnDownload;
+        selectedSchema.onUpgrade = selectedSchema.supportsOnUpgrade;
+        selectedSchema.onRename = selectedSchema.supportsOnRename;
        selectedSchema.onApplicationUpdate = selectedSchema.supportsOnApplicationUpdate;

        return selectedSchema;
--- a/frontend/src/Store/Actions/historyActions.js
+++ b/frontend/src/Store/Actions/historyActions.js
@@ -54,7 +54,7 @@ export const defaultState = {
    },
    {
      name: 'grabTitle',
-      label: translate('GrabTitle'),
+      label: translate('Grab Title'),
      isSortable: false,
      isVisible: false
    },
@@ -78,7 +78,7 @@ export const defaultState = {
    },
    {
      name: 'elapsedTime',
-      label: translate('ElapsedTime'),
+      label: translate('Elapsed Time'),
      isSortable: false,
      isVisible: true
    },
--- a/frontend/src/Store/Actions/releaseActions.js
+++ b/frontend/src/Store/Actions/releaseActions.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
 import { filterBuilderTypes, filterBuilderValueTypes, sortDirections } from 'Helpers/Props';
@@ -230,7 +229,6 @@ export const CANCEL_FETCH_RELEASES = 'releases/cancelFetchReleases';
 export const SET_RELEASES_SORT = 'releases/setReleasesSort';
 export const CLEAR_RELEASES = 'releases/clearReleases';
 export const GRAB_RELEASE = 'releases/grabRelease';
-export const SAVE_RELEASE = 'releases/saveRelease';
 export const BULK_GRAB_RELEASES = 'release/bulkGrabReleases';
 export const UPDATE_RELEASE = 'releases/updateRelease';
 export const SET_RELEASES_FILTER = 'releases/setReleasesFilter';
@@ -245,7 +243,6 @@ export const cancelFetchReleases = createThunk(CANCEL_FETCH_RELEASES);
 export const setReleasesSort = createAction(SET_RELEASES_SORT);
 export const clearReleases = createAction(CLEAR_RELEASES);
 export const grabRelease = createThunk(GRAB_RELEASE);
-export const saveRelease = createThunk(SAVE_RELEASE);
 export const bulkGrabReleases = createThunk(BULK_GRAB_RELEASES);
 export const updateRelease = createAction(UPDATE_RELEASE);
 export const setReleasesFilter = createAction(SET_RELEASES_FILTER);
@@ -307,38 +304,14 @@ export const actionHandlers = handleThunks({
    });
  },

-  [SAVE_RELEASE]: function(getState, payload, dispatch) {
-    const link = payload.downloadUrl;
-    const file = payload.fileName;
-
-    $.ajax({
-      url: link,
-      method: 'GET',
-      headers: {
-        'X-Prowlarr-Client': true
-      },
-      xhrFields: {
-        responseType: 'blob'
-      },
-      success: function(data) {
-        const a = document.createElement('a');
-        const url = window.URL.createObjectURL(data);
-        a.href = url;
-        a.download = file;
-        document.body.append(a);
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-    });
-  },
-
  [BULK_GRAB_RELEASES]: function(getState, payload, dispatch) {
    dispatch(set({
      section,
      isGrabbing: true
    }));

+    console.log(payload);
+
    const promise = createAjaxRequest({
      url: '/search/bulk',
      method: 'POST',
--- a/frontend/src/System/Backup/Backups.js
+++ b/frontend/src/System/Backup/Backups.js
@@ -25,7 +25,7 @@ const columns = [
  },
  {
    name: 'size',
-    label: translate('Size'),
+    label: 'Size',
    isVisible: true
  },
  {
--- a/frontend/src/System/Updates/Updates.js
+++ b/frontend/src/System/Updates/Updates.js
@@ -113,7 +113,7 @@ class Updates extends Component {
                />

                <div className={styles.message}>
-                  {translate('TheLatestVersionIsAlreadyInstalled', ['Prowlarr'])}
+                  The latest version of Prowlarr is already installed
                </div>

                {
--- a/frontend/src/Utilities/Number/formatBytes.js
+++ b/frontend/src/Utilities/Number/formatBytes.js
@@ -1,4 +1,4 @@
-import { filesize } from 'filesize';
+import filesize from 'filesize';

 function formatBytes(input) {
  const size = Number(input);
--- a/frontend/src/Utilities/createAjaxRequest.js
+++ b/frontend/src/Utilities/createAjaxRequest.js
@@ -16,11 +16,6 @@ function addApiKey(ajaxOptions) {
  ajaxOptions.headers['X-Api-Key'] = window.Prowlarr.apiKey;
 }

-function addUIHeader(ajaxOptions) {
-  ajaxOptions.headers = ajaxOptions.headers || {};
-  ajaxOptions.headers['X-Prowlarr-Client'] = true;
-}
-
 function addContentType(ajaxOptions) {
  if (
    ajaxOptions.contentType == null &&
@@ -47,7 +42,6 @@ export default function createAjaxRequest(originalAjaxOptions) {
  if (isRelative(ajaxOptions)) {
    addRootUrl(ajaxOptions);
    addApiKey(ajaxOptions);
-    addUIHeader(ajaxOptions);
    addContentType(ajaxOptions);
  }

--- a/frontend/src/index.ejs
+++ b/frontend/src/index.ejs
@@ -11,7 +11,7 @@
    <!-- Windows Phone -->
    <meta name="msapplication-navbutton-color" content="#3a3f51" />

-    <meta name="description" content="Prowlarr" />
+    <meta name="description" content="Prowlarr (Preview)" />

    <link
      rel="apple-touch-icon"
@@ -50,7 +50,7 @@
    <link rel="stylesheet" type="text/css" href="/Content/Fonts/fonts.css">
    <!-- webpack bundles head -->

-    <title>Prowlarr</title>
+    <title>Prowlarr (Preview)</title>

    <!--
      The super basic styling for .root  will live here,
--- a/package.json
+++ b/package.json
@@ -11,8 +11,7 @@
    "lint": "esprint check",
    "lint-fix": "esprint check --fix",
    "stylelint-linux": "stylelint $(find frontend -name '*.css') --config frontend/.stylelintrc",
-    "stylelint-windows": "stylelint frontend/**/*.css --config frontend/.stylelintrc",
-    "check-modules": "are-you-es5 check . -r"
+    "stylelint-windows": "stylelint frontend/**/*.css --config frontend/.stylelintrc"
  },
  "repository": "https://github.com/Prowlarr/Prowlarr",
  "author": "Team Prowlarr",
@@ -26,110 +25,107 @@
    "not chrome < 60"
  ],
  "dependencies": {
-    "@fortawesome/fontawesome-free": "6.2.1",
-    "@fortawesome/fontawesome-svg-core": "6.2.1",
-    "@fortawesome/free-regular-svg-icons": "6.2.1",
-    "@fortawesome/free-solid-svg-icons": "6.2.1",
-    "@fortawesome/react-fontawesome": "0.2.0",
-    "@microsoft/signalr": "6.0.13",
-    "@sentry/browser": "7.28.0",
-    "@sentry/integrations": "7.28.0",
-    "chart.js": "4.1.1",
-    "classnames": "2.3.2",
-    "clipboard": "2.0.11",
-    "connected-react-router": "6.9.3",
+    "@fortawesome/fontawesome-free": "6.1.1",
+    "@fortawesome/fontawesome-svg-core": "6.1.1",
+    "@fortawesome/free-regular-svg-icons": "6.1.1",
+    "@fortawesome/free-solid-svg-icons": "6.1.1",
+    "@fortawesome/react-fontawesome": "0.1.18",
+    "@microsoft/signalr": "6.0.6",
+    "@sentry/browser": "6.19.2",
+    "@sentry/integrations": "6.19.2",
+    "chart.js": "3.7.1",
+    "classnames": "2.3.1",
+    "clipboard": "2.0.10",
+    "connected-react-router": "6.9.1",
    "element-class": "0.2.2",
-    "filesize": "10.0.6",
+    "filesize": "6.3.0",
    "history": "4.10.1",
    "https-browserify": "1.0.0",
    "jdu": "1.0.0",
-    "jquery": "3.6.2",
+    "jquery": "3.6.0",
    "lodash": "4.17.21",
    "mobile-detect": "1.4.5",
-    "moment": "2.29.4",
+    "moment": "2.29.2",
    "mousetrap": "1.6.5",
    "normalize.css": "8.0.1",
    "prop-types": "15.8.1",
-    "qs": "6.11.0",
+    "qs": "6.10.3",
    "react": "17.0.2",
    "react-addons-shallow-compare": "15.6.3",
    "react-async-script": "1.2.0",
    "react-autosuggest": "10.1.0",
-    "react-custom-scrollbars-2": "4.5.0",
+    "react-custom-scrollbars-2": "4.4.0",
    "react-dnd": "14.0.4",
    "react-dnd-html5-backend": "14.0.2",
    "react-dnd-multi-backend": "6.0.2",
    "react-dnd-touch-backend": "14.1.1",
    "react-document-title": "2.0.3",
    "react-dom": "17.0.2",
-    "react-focus-lock": "2.9.2",
+    "react-focus-lock": "2.5.0",
    "react-google-recaptcha": "2.1.0",
    "react-lazyload": "3.2.0",
    "react-measure": "1.4.7",
    "react-popper": "1.3.7",
-    "react-redux": "8.0.5",
+    "react-redux": "7.2.4",
    "react-router": "5.2.0",
    "react-router-dom": "5.2.0",
-    "react-text-truncate": "0.19.0",
    "react-virtualized": "9.21.1",
-    "redux": "4.2.0",
+    "redux": "4.1.0",
    "redux-actions": "2.6.5",
    "redux-batched-actions": "0.5.0",
    "redux-localstorage": "0.4.1",
-    "redux-thunk": "2.4.2",
-    "reselect": "4.1.7"
+    "redux-thunk": "2.3.0",
+    "reselect": "4.0.0"
  },
  "devDependencies": {
-    "@babel/core": "7.20.5",
-    "@babel/eslint-parser": "7.19.1",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-decorators": "7.20.5",
-    "@babel/plugin-proposal-export-default-from": "7.18.10",
-    "@babel/plugin-proposal-export-namespace-from": "7.18.9",
-    "@babel/plugin-proposal-function-sent": "7.18.6",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@babel/plugin-proposal-numeric-separator": "7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "7.18.9",
-    "@babel/plugin-proposal-throw-expressions": "7.18.6",
+    "@babel/core": "7.18.2",
+    "@babel/eslint-parser": "7.18.2",
+    "@babel/plugin-proposal-class-properties": "7.17.12",
+    "@babel/plugin-proposal-decorators": "7.18.2",
+    "@babel/plugin-proposal-export-default-from": "7.17.12",
+    "@babel/plugin-proposal-export-namespace-from": "7.17.12",
+    "@babel/plugin-proposal-function-sent": "7.18.2",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.17.12",
+    "@babel/plugin-proposal-numeric-separator": "7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "7.17.12",
+    "@babel/plugin-proposal-throw-expressions": "7.16.7",
    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-react": "7.18.6",
-    "are-you-es5": "2.1.2",
-    "autoprefixer": "10.4.13",
-    "babel-loader": "9.1.0",
+    "@babel/preset-env": "7.18.2",
+    "@babel/preset-react": "7.17.12",
+    "autoprefixer": "10.4.7",
+    "babel-loader": "8.2.5",
    "babel-plugin-inline-classnames": "2.0.1",
    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "core-js": "3.26.1",
-    "css-loader": "6.7.3",
-    "eslint": "8.30.0",
+    "core-js": "3.22.8",
+    "css-loader": "6.7.1",
+    "eslint": "8.17.0",
    "eslint-plugin-filenames": "1.3.2",
    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-react": "7.31.11",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-simple-import-sort": "8.0.0",
+    "eslint-plugin-react": "7.30.0",
+    "eslint-plugin-simple-import-sort": "7.0.0",
    "esprint": "3.6.0",
    "file-loader": "6.2.0",
-    "filemanager-webpack-plugin": "8.0.0",
+    "filemanager-webpack-plugin": "6.1.7",
    "html-webpack-plugin": "5.5.0",
-    "loader-utils": "^3.2.1",
-    "mini-css-extract-plugin": "2.7.2",
-    "postcss": "8.4.20",
+    "loader-utils": "^3.0.0",
+    "mini-css-extract-plugin": "2.6.0",
+    "postcss": "8.4.14",
    "postcss-color-function": "4.1.0",
-    "postcss-loader": "7.0.2",
-    "postcss-mixins": "9.0.4",
-    "postcss-nested": "6.0.0",
-    "postcss-simple-vars": "7.0.1",
+    "postcss-loader": "6.2.1",
+    "postcss-mixins": "9.0.2",
+    "postcss-nested": "5.0.6",
+    "postcss-simple-vars": "6.0.3",
    "postcss-url": "10.1.3",
    "require-nocache": "1.0.0",
    "rimraf": "3.0.2",
    "run-sequence": "2.2.1",
    "streamqueue": "1.1.2",
    "style-loader": "3.3.1",
-    "stylelint": "14.16.0",
+    "stylelint": "14.8.5",
    "stylelint-order": "5.0.0",
    "url-loader": "4.1.1",
-    "webpack": "5.75.0",
-    "webpack-cli": "5.0.1",
+    "webpack": "5.73.0",
+    "webpack-cli": "4.9.2",
    "webpack-livereload-plugin": "3.0.2"
  }
 }
--- a/src/.globalconfig
+++ b/src/.globalconfig
@@ -1,3 +0,0 @@
-is_global = true
-
-dotnet_diagnostic.CA1014.severity = none
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
  <!-- Common to all Prowlarr Projects -->
  <PropertyGroup>
-    <AnalysisLevel>6.0-all</AnalysisLevel>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles> 
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -95,7 +94,7 @@
  
  <!-- Standard testing packages -->
  <ItemGroup Condition="'$(TestProject)'=='true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
--- a/src/NzbDrone.Automation.Test/AutomationTest.cs
+++ b/src/NzbDrone.Automation.Test/AutomationTest.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Automation.Test

            _runner = new NzbDroneRunner(LogManager.GetCurrentClassLogger(), null);
            _runner.KillAll();
-            _runner.Start(true);
+            _runner.Start();

            driver.Url = "http://localhost:9696";

--- a/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
@@ -53,26 +53,6 @@ namespace NzbDrone.Common.Test.Http
            newUri.FullUri.Should().Be(expected);
        }

-        [TestCase("", "./relative", "relative")]
-        [TestCase("/", "./relative", "/relative")]
-        [TestCase("/base", "./relative", "/relative")]
-        [TestCase("/base/sub", "./relative", "/base/relative")]
-        [TestCase("/base/sub/", "./relative", "/base/sub/relative")]
-        [TestCase("base/sub", "./relative", "base/relative")]
-        [TestCase("base/sub/", "./relative", "base/sub/relative")]
-        [TestCase("", "../relative", "relative")]
-        [TestCase("/", "../relative", "/relative")]
-        [TestCase("/base", "../relative", "/relative")]
-        [TestCase("/base/sub", "../relative", "/base/relative")]
-        [TestCase("/base/sub/", "../relative", "/base/sub/relative")]
-        [TestCase("base/sub", "../relative", "base/relative")]
-        [TestCase("base/sub/", "../relative", "base/sub/relative")]
-        public void should_combine_uri_with_dot_segment(string basePath, string relativePath, string expected)
-        {
-            var newUri = new HttpUri(basePath) + new HttpUri(relativePath);
-            newUri.FullUri.Should().Be(expected);
-        }
-
        [TestCase("", "", "")]
        [TestCase("/", "", "/")]
        [TestCase("base", "", "base")]
--- a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
@@ -24,16 +24,12 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        [TestCase(@"https://beyond-hd.me/api/torrents/2b51db35e1912ffc138825a12b9933d2")]
        [TestCase(@"Req: [POST] https://www3.yggtorrent.nz/user/login: id=mySecret&pass=mySecret&ci_csrf_token=2b51db35e1912ffc138825a12b9933d2")]
        [TestCase(@"https://torrentseeds.org/api/torrents/filter?api_token=2b51db35e1912ffc138825a12b9933d2&name=&sortField=created_at&sortDirection=desc&perPage=100&page=1")]
-        [TestCase(@"https://beyond-hd.me/torrent/download/the-next-365-days-2022-2160p-nf-web-dl-dual-ddp-51-dovi-hdr-hevc-apex.225146.2b51db35e1912ffc138825a12b9933d2")]
-        [TestCase(@"https://anthelion.me/api.php?api_key=2b51db35e1910123321025a12b9933d2&o=json&t=movie&q=&tmdb=&imdb=&cat=&limit=100&offset=0")]
-        [TestCase(@"https://avistaz.to/api/v1/jackett/auth: username=mySecret&password=mySecret&pid=mySecret")]

        // Indexer and Download Client Responses

        // avistaz response
        [TestCase(@"""download"":""https://avistaz.to/rss/download/2b51db35e1910123321025a12b9933d2/tb51db35e1910123321025a12b9933d2.torrent"",")]
        [TestCase(@",""info_hash"":""2b51db35e1910123321025a12b9933d2"",")]
-        [TestCase(@"""token"":""2b51db35e1910123321025a12b9933d2""")]

        // animebytes response
        [TestCase(@"""Link"":""https://animebytes.tv/torrent/994064/download/tb51db35e1910123321025a12b9933d2"",")]
--- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
@@ -278,7 +278,7 @@ namespace NzbDrone.Common.Test
        [Test]
        public void GetUpdateClientExePath()
        {
-            GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\prowlarr_update\Prowlarr.Update".AsOsAgnostic().ProcessNameToExe());
+            GetIAppDirectoryInfo().GetUpdateClientExePath(PlatformType.DotNet).Should().BeEquivalentTo(@"C:\Temp\prowlarr_update\Prowlarr.Update.exe".AsOsAgnostic());
        }

        [Test]
--- a/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs
@@ -9,7 +9,6 @@ namespace NzbDrone.Common.EnvironmentInfo
        bool IsAdmin { get; }
        bool IsWindowsService { get; }
        bool IsWindowsTray { get; }
-        bool IsStarting { get; set; }
        bool IsExiting { get; set; }
        bool IsTray { get; }
        RuntimeMode Mode { get; }
--- a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs
@@ -2,6 +2,13 @@ using System;

 namespace NzbDrone.Common.EnvironmentInfo
 {
+    public enum PlatformType
+    {
+        DotNet = 0,
+        Mono = 1,
+        NetCore = 2
+    }
+
    public interface IPlatformInfo
    {
        Version Version { get; }
@@ -9,18 +16,36 @@ namespace NzbDrone.Common.EnvironmentInfo

    public class PlatformInfo : IPlatformInfo
    {
+        private static PlatformType _platform;
        private static Version _version;

        static PlatformInfo()
        {
+            _platform = PlatformType.NetCore;
            _version = Environment.Version;
        }

+        public static PlatformType Platform => _platform;
+        public static bool IsMono => Platform == PlatformType.Mono;
+        public static bool IsDotNet => Platform == PlatformType.DotNet;
+        public static bool IsNetCore => Platform == PlatformType.NetCore;
+
        public static string PlatformName
        {
            get
            {
-                return ".NET";
+                if (IsDotNet)
+                {
+                    return ".NET";
+                }
+                else if (IsMono)
+                {
+                    return "Mono";
+                }
+                else
+                {
+                    return ".NET Core";
+                }
            }
        }

--- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
@@ -19,7 +19,6 @@ namespace NzbDrone.Common.EnvironmentInfo
            _logger = logger;

            IsWindowsService = hostLifetime is WindowsServiceLifetime;
-            IsStarting = true;

            // net6.0 will return Radarr.dll for entry assembly, we need the actual
            // executable name (Radarr on linux).  On mono this will return the location of
@@ -83,7 +82,6 @@ namespace NzbDrone.Common.EnvironmentInfo

        public bool IsWindowsService { get; private set; }

-        public bool IsStarting { get; set; }
        public bool IsExiting { get; set; }
        public bool IsTray
        {
--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -33,7 +33,7 @@ namespace NzbDrone.Common.Extensions

            var info = new FileInfo(path.Trim());

-            // UNC
+            //UNC
            if (OsInfo.IsWindows && info.FullName.StartsWith(@"\\"))
            {
                return info.FullName.TrimEnd('/', '\\', ' ');
@@ -166,7 +166,7 @@ namespace NzbDrone.Common.Extensions
            var parentDirInfo = dirInfo.Parent;
            if (parentDirInfo == null)
            {
-                // Drive letter
+                //Drive letter
                return dirInfo.Name.ToUpper();
            }

@@ -238,9 +238,9 @@ namespace NzbDrone.Common.Extensions
            return null;
        }

-        public static string ProcessNameToExe(this string processName)
+        public static string ProcessNameToExe(this string processName, PlatformType runtime)
        {
-            if (OsInfo.IsWindows)
+            if (OsInfo.IsWindows || runtime != PlatformType.NetCore)
            {
                processName += ".exe";
            }
@@ -248,6 +248,11 @@ namespace NzbDrone.Common.Extensions
            return processName;
        }

+        public static string ProcessNameToExe(this string processName)
+        {
+            return processName.ProcessNameToExe(PlatformInfo.Platform);
+        }
+
        public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
        {
            return appFolderInfo.AppDataFolder;
@@ -313,9 +318,9 @@ namespace NzbDrone.Common.Extensions
            return Path.Combine(GetUpdatePackageFolder(appFolderInfo), UPDATE_CLIENT_FOLDER_NAME);
        }

-        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo)
+        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo, PlatformType runtime)
        {
-            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe();
+            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe(runtime);
        }

        public static string GetDatabase(this IAppFolderInfo appFolderInfo)
--- a/src/NzbDrone.Common/Extensions/StringExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/StringExtensions.cs
@@ -131,7 +131,7 @@ namespace NzbDrone.Common.Extensions

        public static string WrapInQuotes(this string text)
        {
-            if (!text.Contains(' '))
+            if (!text.Contains(" "))
            {
                return text;
            }
@@ -255,20 +255,7 @@ namespace NzbDrone.Common.Extensions

        public static string ToUrlHost(this string input)
        {
-            return input.Contains(':') ? $"[{input}]" : input;
-        }
-
-        public static bool IsAllDigits(this string input)
-        {
-            foreach (var c in input)
-            {
-                if (c < '0' || c > '9')
-                {
-                    return false;
-                }
-            }
-
-            return true;
+            return input.Contains(":") ? $"[{input}]" : input;
        }
    }
 }
--- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
@@ -113,7 +113,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                {
                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
                    {
-                        await responseMessage.Content.CopyToAsync(request.ResponseStream, null, cts.Token);
+                        responseMessage.Content.CopyTo(request.ResponseStream, null, cts.Token);
                    }
                    else
                    {
--- a/src/NzbDrone.Common/Http/HttpResponse.cs
+++ b/src/NzbDrone.Common/Http/HttpResponse.cs
@@ -76,7 +76,6 @@ namespace NzbDrone.Common.Http
            get
            {
                var newUrl = Headers["Location"];
-
                if (newUrl == null)
                {
                    newUrl = Headers["Refresh"];
--- a/src/NzbDrone.Common/Http/HttpUri.cs
+++ b/src/NzbDrone.Common/Http/HttpUri.cs
@@ -166,37 +166,6 @@ namespace NzbDrone.Common.Http
                return relativePath;
            }

-            if (relativePath.StartsWith("./"))
-            {
-                relativePath = relativePath.TrimStart('.').TrimStart('/');
-
-                var lastIndex = basePath.LastIndexOf("/");
-
-                if (lastIndex > 0)
-                {
-                    basePath = basePath.Substring(0, lastIndex) + "/";
-                }
-            }
-
-            if (relativePath.StartsWith("../"))
-            {
-                relativePath = relativePath.TrimStart('.').TrimStart('/');
-
-                var lastIndex = basePath.LastIndexOf("/");
-
-                if (lastIndex > 0)
-                {
-                    basePath = basePath.Substring(0, lastIndex) + "/";
-                }
-
-                var secondLastIndex = basePath.LastIndexOf("/");
-
-                if (lastIndex > 0)
-                {
-                    basePath = basePath.Substring(0, secondLastIndex) + "/";
-                }
-            }
-
            var baseSlashIndex = basePath.LastIndexOf('/');

            if (baseSlashIndex >= 0)
--- a/src/NzbDrone.Common/Http/TooManyRequestsException.cs
+++ b/src/NzbDrone.Common/Http/TooManyRequestsException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace NzbDrone.Common.Http
 {
@@ -11,23 +11,19 @@ namespace NzbDrone.Common.Http
        {
            if (response.Headers.ContainsKey("Retry-After"))
            {
-                var retryAfter = response.Headers["Retry-After"];
+                var retryAfter = response.Headers["Retry-After"].ToString();
+                int seconds;
+                DateTime date;

-                if (int.TryParse(retryAfter, out var seconds))
+                if (int.TryParse(retryAfter, out seconds))
                {
                    RetryAfter = TimeSpan.FromSeconds(seconds);
                }
-                else if (DateTime.TryParse(retryAfter, out var date))
+                else if (DateTime.TryParse(retryAfter, out date))
                {
                    RetryAfter = date.ToUniversalTime() - DateTime.UtcNow;
                }
            }
        }
-
-        public TooManyRequestsException(HttpRequest request, HttpResponse response, TimeSpan retryWait)
-            : base(request, response)
-        {
-            RetryAfter = retryWait;
-        }
    }
 }
--- a/src/NzbDrone.Common/Http/UserAgentParser.cs
+++ b/src/NzbDrone.Common/Http/UserAgentParser.cs
@@ -1,4 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;

 namespace NzbDrone.Common.Http
 {
--- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -7,10 +8,10 @@ namespace NzbDrone.Common.Instrumentation
 {
    public class CleanseLogMessage
    {
-        private static readonly Regex[] CleansingRules =
-        {
+        private static readonly Regex[] CleansingRules = new[]
+            {
                // Url
-                new Regex(@"(?<=[?&: ;])(apikey|api_key|(?:(?:access|api)[-_]?)?token|pass(?:key|wd)?|auth|authkey|user|u?id|api|[a-z_]*apikey|account|pid|pwd)=(?<secret>[^&=""]+?)(?=[ ""&=]|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=[?&: ;])(apikey|(?:(?:access|api)[-_]?)?token|pass(?:key|wd)?|auth|authkey|user|u?id|api|[a-z_]*apikey|account|pwd)=(?<secret>[^&=""]+?)(?=[ ""&=]|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=[?& ;])[^=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"rss\.torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"rss\.torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -20,7 +21,6 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"\b(\w*)?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=authkey = "")(?<secret>[^&=]+?)(?="")", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=beyond-hd\.[a-z]+/api/torrents/)(?<secret>[^&=][a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"(?<=beyond-hd\.[a-z]+/torrent/download/[\w\d-]+[.]\d+[.])(?<secret>[a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

                // UNIT3D
                new Regex(@"(?<=[a-z0-9-]+\.[a-z]+/torrent/download/\d+\.)(?<secret>[^&=][a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -58,10 +58,9 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"(?:avistaz|exoticaz|cinemaz|privatehd)\.[a-z]{2,3}/rss/download/(?<secret>[^&=]+?)/(?<secret>[^&=]+?)\.torrent", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?:animebytes)\.[a-z]{2,3}/torrent/[0-9]+/download/(?<secret>[^&=]+?)[""]", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@",""info_hash"":""(?<secret>[^&=]+?)"",", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"""token"":""(?<secret>[^&=]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@",""pass[- _]?key"":""(?<secret>[^&=]+?)"",", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@",""rss[- _]?key"":""(?<secret>[^&=]+?)"",", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-        };
+            };

        private static readonly Regex CleanseRemoteIPRegex = new Regex(@"(?:Auth-\w+(?<!Failure|Unauthorized) ip|from) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", RegexOptions.Compiled);

--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs
@@ -11,41 +11,26 @@ namespace NzbDrone.Common.Instrumentation.Sentry
        {
            try
            {
-                if (sentryEvent.Message is not null)
-                {
-                    sentryEvent.Message.Formatted = CleanseLogMessage.Cleanse(sentryEvent.Message.Formatted);
-                    sentryEvent.Message.Message = CleanseLogMessage.Cleanse(sentryEvent.Message.Message);
-                    sentryEvent.Message.Params = sentryEvent.Message.Params?.Select(x => CleanseLogMessage.Cleanse(x switch
-                    {
-                        string str => str,
-                        _ => x.ToString()
-                    })).ToList();
-                }
+                sentryEvent.Message = CleanseLogMessage.Cleanse(sentryEvent.Message.Message);

-                if (sentryEvent.Fingerprint.Any())
+                if (sentryEvent.Fingerprint != null)
                {
                    var fingerprint = sentryEvent.Fingerprint.Select(x => CleanseLogMessage.Cleanse(x)).ToList();
                    sentryEvent.SetFingerprint(fingerprint);
                }

-                if (sentryEvent.Extra.Any())
+                if (sentryEvent.Extra != null)
                {
-                    var extras = sentryEvent.Extra.ToDictionary(x => x.Key, y => (object)CleanseLogMessage.Cleanse(y.Value as string));
+                    var extras = sentryEvent.Extra.ToDictionary(x => x.Key, y => (object)CleanseLogMessage.Cleanse((string)y.Value));
                    sentryEvent.SetExtras(extras);
                }

-                if (sentryEvent.SentryExceptions is not null)
+                foreach (var exception in sentryEvent.SentryExceptions)
                {
-                    foreach (var exception in sentryEvent.SentryExceptions)
+                    exception.Value = CleanseLogMessage.Cleanse(exception.Value);
+                    foreach (var frame in exception.Stacktrace.Frames)
                    {
-                        exception.Value = CleanseLogMessage.Cleanse(exception.Value);
-                        if (exception.Stacktrace is not null)
-                        {
-                            foreach (var frame in exception.Stacktrace.Frames)
-                            {
-                                frame.FileName = ShortenPath(frame.FileName);
-                            }
-                        }
+                        frame.FileName = ShortenPath(frame.FileName);
                    }
                }
            }
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -8,7 +8,6 @@ using System.Threading;
 using NLog;
 using NLog.Common;
 using NLog.Targets;
-using Npgsql;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using Sentry;
@@ -35,14 +34,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            SQLiteErrorCode.Auth
        };

-        private static readonly HashSet<string> FilteredPostgresErrorCodes = new HashSet<string>
-        {
-            PostgresErrorCodes.OutOfMemory,
-            PostgresErrorCodes.TooManyConnections,
-            PostgresErrorCodes.DiskFull,
-            PostgresErrorCodes.ProgramLimitExceeded
-        };
-
        // use string and not Type so we don't need a reference to the project
        // where these are defined
        private static readonly HashSet<string> FilteredExceptionTypeNames = new HashSet<string>
@@ -51,7 +42,10 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            "UnauthorizedAccessException",

            // Filter out people stuck in boot loops
-            "CorruptDatabaseException"
+            "CorruptDatabaseException",
+
+            // This also filters some people in boot loops
+            "TinyIoCResolutionException"
        };

        public static readonly List<string> FilteredExceptionMessages = new List<string>
@@ -108,6 +102,9 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                                      o.Dsn = dsn;
                                      o.AttachStacktrace = true;
                                      o.MaxBreadcrumbs = 200;
+                                      o.SendDefaultPii = false;
+                                      o.Debug = false;
+                                      o.DiagnosticLevel = SentryLevel.Debug;
                                      o.Release = BuildInfo.Release;
                                      o.BeforeSend = x => SentryCleanser.CleanseEvent(x);
                                      o.BeforeBreadcrumb = x => SentryCleanser.CleanseBreadcrumb(x);
@@ -213,11 +210,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            if (ex != null)
            {
                fingerPrint.Add(ex.GetType().FullName);
-                if (ex.TargetSite != null)
-                {
-                    fingerPrint.Add(ex.TargetSite.ToString());
-                }
-
+                fingerPrint.Add(ex.TargetSite.ToString());
                if (ex.InnerException != null)
                {
                    fingerPrint.Add(ex.InnerException.GetType().FullName);
@@ -248,19 +241,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                        return false;
                    }

-                    var pgEx = logEvent.Exception as PostgresException;
-                    if (pgEx != null && FilteredPostgresErrorCodes.Contains(pgEx.SqlState))
-                    {
-                        return false;
-                    }
-
-                    // We don't care about transient network and timeout errors
-                    var npgEx = logEvent.Exception as NpgsqlException;
-                    if (npgEx != null && npgEx.IsTransient)
-                    {
-                        return false;
-                    }
-
                    if (FilteredExceptionTypeNames.Contains(logEvent.Exception.GetType().Name))
                    {
                        return false;
--- a/src/NzbDrone.Common/OAuth/OAuthTools.cs
+++ b/src/NzbDrone.Common/OAuth/OAuthTools.cs
@@ -226,7 +226,7 @@ namespace NzbDrone.Common.OAuth
 #if WINRT
            return CultureInfo.InvariantCulture.CompareInfo.Compare(left, right, CompareOptions.IgnoreCase) == 0;
 #else
-            return string.Equals(left, right, StringComparison.InvariantCultureIgnoreCase);
+            return string.Compare(left, right, StringComparison.InvariantCultureIgnoreCase) == 0;
 #endif
        }

--- a/src/NzbDrone.Common/Prowlarr.Common.csproj
+++ b/src/NzbDrone.Common/Prowlarr.Common.csproj
@@ -4,19 +4,18 @@
    <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.3.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="NLog" Version="5.1.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
-    <PackageReference Include="Npgsql" Version="5.0.11" />
-    <PackageReference Include="Sentry" Version="3.24.1" />
+    <PackageReference Include="DryIoc.dll" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NLog" Version="5.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Include="Sentry" Version="3.21.0" />
    <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
    <PackageReference Include="SharpZipLib" Version="1.3.3" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
--- a/src/NzbDrone.Common/ServiceProvider.cs
+++ b/src/NzbDrone.Common/ServiceProvider.cs
@@ -64,7 +64,7 @@ namespace NzbDrone.Common

            var args = $"create {serviceName} " +
                $"DisplayName= \"{serviceName}\" " +
-                $"binpath= \"{Environment.ProcessPath}\" " +
+                $"binpath= \"{Process.GetCurrentProcess().MainModule.FileName}\" " +
                "start= auto " +
                "depend= EventLog/Tcpip/http " +
                "obj= \"NT AUTHORITY\\LocalService\"";
--- a/src/NzbDrone.Common/TPL/LimitedConcurrencyLevelTaskScheduler.cs
+++ b/src/NzbDrone.Common/TPL/LimitedConcurrencyLevelTaskScheduler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -19,7 +19,7 @@ namespace NzbDrone.Common.TPL
        private readonly int _maxDegreeOfParallelism;

        /// <summary>Whether the scheduler is currently processing work items.</summary>
-        private int _delegatesQueuedOrRunning;
+        private int _delegatesQueuedOrRunning = 0;

        /// <summary>
        /// Initializes an instance of the LimitedConcurrencyLevelTaskScheduler class with the
--- a/src/NzbDrone.Core.Test/Files/Indexers/Newznab/newznab_caps.xml
+++ b/src/NzbDrone.Core.Test/Files/Indexers/Newznab/newznab_caps.xml
@@ -18,7 +18,6 @@
      <subcat id="5030" name="SD"/>
      <subcat id="5060" name="Sport"/>
      <subcat id="5010" name="WEB-DL"/>
-      <subcat id="5999" name="Other"/>
    </category>
    <category id="7000" name="Other">
      <subcat id="7010" name="Misc"/>
--- a/src/NzbDrone.Core.Test/Files/Indexers/SecretCinema/recentfeed.json
+++ b/src/NzbDrone.Core.Test/Files/Indexers/SecretCinema/recentfeed.json
@@ -1,144 +0,0 @@
-{
-  "status": "success",
-  "response": {
-    "currentPage": 1,
-    "pages": 1,
-    "results": [
-      {
-        "groupId": 2497,
-        "groupName": "Singin&#39; in the Rain",
-        "artist": "Gene Kelly & Stanley Donen",
-        "cover": "https:\/\/www.themoviedb.org\/t\/p\/original\/g2AaJDC2vSRcqHSDH29642xmQd.jpg",
-        "tags": [ "comedy", "musical", "romance" ],
-        "bookmarked": false,
-        "vanityHouse": false,
-        "groupYear": 1952,
-        "releaseType": null,
-        "groupTime": "1671129449",
-        "maxSize": 57473058680,
-        "totalSnatched": 25,
-        "totalSeeders": 9,
-        "totalLeechers": 0,
-        "torrents": [
-          {
-            "torrentId": 3599,
-            "editionId": 1,
-            "artists": [
-              {
-                "id": 126,
-                "name": "Gene Kelly",
-                "aliasid": 127
-              },
-              {
-                "id": 125,
-                "name": "Stanley Donen",
-                "aliasid": 126
-              }
-            ],
-            "remastered": false,
-            "remasterYear": 0,
-            "remasterCatalogueNumber": "",
-            "remasterTitle": "",
-            "media": "1080p",
-            "encoding": "",
-            "format": "",
-            "hasLog": false,
-            "logScore": 0,
-            "hasCue": false,
-            "scene": false,
-            "vanityHouse": false,
-            "fileCount": 1,
-            "time": "2017-09-10 11:47:27",
-            "size": 24724893991,
-            "snatches": 14,
-            "seeders": 1,
-            "leechers": 0,
-            "isFreeleech": true,
-            "isNeutralLeech": false,
-            "isPersonalFreeleech": false,
-            "canUseToken": false,
-            "hasSnatched": false
-          },
-          {
-            "torrentId": 45068,
-            "editionId": 2,
-            "artists": [
-              {
-                "id": 126,
-                "name": "Gene Kelly",
-                "aliasid": 127
-              },
-              {
-                "id": 125,
-                "name": "Stanley Donen",
-                "aliasid": 126
-              }
-            ],
-            "remastered": false,
-            "remasterYear": 0,
-            "remasterCatalogueNumber": "",
-            "remasterTitle": "",
-            "media": "2160p",
-            "encoding": "",
-            "format": "",
-            "hasLog": false,
-            "logScore": 0,
-            "hasCue": false,
-            "scene": false,
-            "vanityHouse": false,
-            "fileCount": 1,
-            "time": "2022-12-15 19:37:29",
-            "size": 57473058680,
-            "snatches": 6,
-            "seeders": 8,
-            "leechers": 0,
-            "isFreeleech": true,
-            "isNeutralLeech": false,
-            "isPersonalFreeleech": false,
-            "canUseToken": false,
-            "hasSnatched": false
-          },
-          {
-            "torrentId": 2726,
-            "editionId": 3,
-            "artists": [
-              {
-                "id": 126,
-                "name": "Gene Kelly",
-                "aliasid": 127
-              },
-              {
-                "id": 125,
-                "name": "Stanley Donen",
-                "aliasid": 126
-              }
-            ],
-            "remastered": false,
-            "remasterYear": 0,
-            "remasterCatalogueNumber": "",
-            "remasterTitle": "",
-            "media": "DVD-R",
-            "encoding": "",
-            "format": "",
-            "hasLog": false,
-            "logScore": 0,
-            "hasCue": false,
-            "scene": false,
-            "vanityHouse": false,
-            "fileCount": 37,
-            "time": "2017-08-26 14:58:58",
-            "size": 10350032896,
-            "snatches": 5,
-            "seeders": 0,
-            "leechers": 0,
-            "isFreeleech": true,
-            "isNeutralLeech": false,
-            "isPersonalFreeleech": false,
-            "canUseToken": false,
-            "hasSnatched": false
-          }
-        ]
-      }
-    ]
-  }
-}
--- a/src/NzbDrone.Core.Test/Files/Indexers/Torznab/torznab_animetosho_caps.xml
+++ b/src/NzbDrone.Core.Test/Files/Indexers/Torznab/torznab_animetosho_caps.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<caps>
-	<server version="1.0" title="Anime Tosho" strapline="Anime NZB/DDL mirror" url="https://animetosho.org/"/>
-	<limits max="200" default="75"/>
-	<retention days="9999"/>
-	<registration available="no" open="yes" />
-	<searching>
-		<search available="yes" supportedParams="q" />
-		<tv-search available="no" supportedParams="q" />
-		<movie-search available="no" supportedParams="q" />
-	</searching>
-	<categories>
-		<category id="5070" name="Anime" description="Anime"/>
-	</categories>
-</caps>
--- a/src/NzbDrone.Core.Test/Files/Indexers/Torznab/torznab_morethantv.xml
+++ b/src/NzbDrone.Core.Test/Files/Indexers/Torznab/torznab_morethantv.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:torznab="http://torznab.com/schemas/2015/feed">
-	<channel>
-		<item>
-			<title>Out of the Past 1947 720p BluRay FLAC2.0 x264-CtrlHD.mkv</title>
-			<guid isPermaLink="true">https://www.morethantv.me/torrents.php?id=(removed)&amp;torrentid=836164</guid>
-			<link>https://www.morethantv.me/torrents.php?action=download&amp;id=(removed)&amp;authkey=(removed)&amp;torrent_pass=(removed)</link>
-			<comments>https://www.morethantv.me/torrents.php?id=(removed)&amp;torrentid=836164</comments>
-			<pubDate>Tue, 20 Dec 2022 21:32:17 +0000</pubDate>
-			<size>5412993028</size>
-			<files>1</files>
-			<grabs>2</grabs>
-			<category>2000</category>
-			<category>2040</category>
-			<description>A private eye escapes his past to run a gas station in a small town, but his past catches up with him. Now he must return to the big city world of danger, corruption, double crosses, and duplicitous dames.</description>
-			<enclosure url="https://www.morethantv.me/torrents.php?action=download&amp;id=(removed)&amp;authkey=(removed)&amp;torrent_pass=(removed)" length="103641" type="application/x-bittorrent" />
-			<torznab:attr name="size" value="5412993028" />
-			<torznab:attr name="poster" value="anon" />
-			<torznab:attr name="seeders" value="3" />
-			<torznab:attr name="leechers" value="0" />
-			<torznab:attr name="peers" value="3" />
-			<torznab:attr name="infohash" value="(removed)" />
-			<torznab:attr name="downloadvolumefactor" value="1" />
-			<torznab:attr name="uploadvolumefactor" value="1" />
-			<torznab:attr name="tag" value="anonymous" />
-			<torznab:attr name="imdb" value="0039689" />
-			<torznab:attr name="imdbid" value="tt0039689" />
-		</item>
-		<item>
-			<title>Out of the Past 1947 1080p USA Blu-ray AVC DTS-HD MA 2.0-PCH</title>
-			<guid isPermaLink="true">https://www.morethantv.me/torrents.php?id=(removed)&amp;torrentid=836165</guid>
-			<link>https://www.morethantv.me/torrents.php?action=download&amp;id=(removed)&amp;authkey=(removed)&amp;torrent_pass=(removed)</link>
-			<comments>https://www.morethantv.me/torrents.php?id=(removed)&amp;torrentid=836165</comments>
-			<pubDate>Tue, 20 Dec 2022 21:47:40 +0000</pubDate>
-			<size>30524085127</size>
-			<files>78</files>
-			<grabs>0</grabs>
-			<category>2000</category>
-			<category>2040</category>
-			<description>A private eye escapes his past to run a gas station in a small town, but his past catches up with him. Now he must return to the big city world of danger, corruption, double crosses, and duplicitous dames.</description>
-			<enclosure url="https://www.morethantv.me/torrents.php?action=download&amp;id=(removed)&amp;authkey=(removed)&amp;torrent_pass=(removed)" length="150224" type="application/x-bittorrent" />
-			<torznab:attr name="size" value="30524085127" />
-			<torznab:attr name="poster" value="anon" />
-			<torznab:attr name="seeders" value="1" />
-			<torznab:attr name="leechers" value="0" />
-			<torznab:attr name="peers" value="1" />
-			<torznab:attr name="infohash" value="(removed)" />
-			<torznab:attr name="downloadvolumefactor" value="1" />
-			<torznab:attr name="uploadvolumefactor" value="1" />
-			<torznab:attr name="tag" value="anonymous" />
-			<torznab:attr name="imdb" value="0039689" />
-			<torznab:attr name="imdbid" value="tt0039689" />
-		</item>
-	</channel>
-</rss>
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
@@ -28,15 +28,15 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        [Test]
        public void should_return_warning_when_branch_not_valid()
        {
-            GivenValidBranch("test");
+            GivenValidBranch("master");

            Subject.Check().ShouldBeWarning();
        }

+        [TestCase("Develop")]
+        [TestCase("develop")]
        [TestCase("nightly")]
        [TestCase("Nightly")]
-        [TestCase("develop")]
-        [TestCase("master")]
        public void should_return_no_warning_when_branch_valid(string branch)
        {
            GivenValidBranch(branch);
--- a/src/NzbDrone.Core.Test/IndexerTests/AvistazTests/AvistazFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/AvistazTests/AvistazFixture.cs
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
            torrentInfo.InfoUrl.Should().Be("https://avistaz.to/torrent/187240-japan-sinks-people-of-hope-2021-s01e05-720p-nf-web-dl-ddp20-x264-seikel");
            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-14 22:26:21"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-15 04:26:21"));
            torrentInfo.Size.Should().Be(935127615);
            torrentInfo.InfoHash.Should().Be("a879261d4e6e792402f92401141a21de70d51bf2");
            torrentInfo.MagnetUrl.Should().Be(null);
--- a/src/NzbDrone.Core.Test/IndexerTests/CardigannTests/ApplyGoTemplateTextFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/CardigannTests/ApplyGoTemplateTextFixture.cs
@@ -71,12 +71,12 @@ namespace NzbDrone.Core.Test.IndexerTests.CardigannTests
            result.Should().Be(expected);
        }

-        [TestCase("{{ .Today.Year }}")]
-        public void should_handle_variables_statements(string template)
+        [TestCase("{{ .Today.Year }}", "2022")]
+        public void should_handle_variables_statements(string template, string expected)
        {
            var result = Subject.ApplyGoTemplateText(template, _variables);

-            result.Should().Be(DateTime.Now.Year.ToString());
+            result.Should().Be(expected);
        }

        [TestCase("{{if .False }}0{{else}}1{{end}}", "1")]
--- a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
@@ -8,7 +8,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions.FileList;
+using NzbDrone.Core.Indexers.FileList;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
@@ -21,15 +21,10 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
        [SetUp]
        public void Setup()
        {
-            Subject.Definition = new IndexerDefinition
+            Subject.Definition = new IndexerDefinition()
            {
                Name = "FileList",
-                Settings = new FileListSettings
-                {
-                    BaseUrl = "https://filelist.io/",
-                    Username = "someuser",
-                    Passkey = "somepass"
-                }
+                Settings = new FileListSettings() { Username = "someuser", Passkey = "somepass" }
            };
        }

@@ -40,9 +35,9 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests

            Mocker.GetMock<IIndexerHttpClient>()
                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
-                .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
+                .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));

-            var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new[] { 2000 } })).Releases;
+            var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

            releases.Should().HaveCount(4);
            releases.First().Should().BeOfType<TorrentInfo>();
@@ -55,14 +50,12 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
            torrentInfo.InfoUrl.Should().Be("https://filelist.io/details.php?id=665873");
            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2020-01-25 20:20:19"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2020-01-25 22:20:19"));
            torrentInfo.Size.Should().Be(8300512414);
            torrentInfo.InfoHash.Should().Be(null);
            torrentInfo.MagnetUrl.Should().Be(null);
            torrentInfo.Peers.Should().Be(2 + 12);
            torrentInfo.Seeders.Should().Be(12);
-
-            releases.Any(t => t.IndexerFlags.Contains(IndexerFlag.Internal)).Should().Be(true);
        }
    }
 }
--- a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions.FileList;
+using NzbDrone.Core.Indexers.FileList;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -16,35 +16,34 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
        [SetUp]
        public void Setup()
        {
-            Subject.Settings = new FileListSettings
+            Subject.Settings = new FileListSettings()
            {
-                BaseUrl = "https://filelist.io/",
                Passkey = "abcd",
-                Username = "somename"
+                Username = "somename",
+                BaseUrl = "https://filelist.io"
            };

            Subject.Capabilities = new IndexerCapabilities
            {
                TvSearchParams = new List<TvSearchParam>
-                {
-                    TvSearchParam.Q, TvSearchParam.ImdbId, TvSearchParam.Season, TvSearchParam.Ep
-                },
+                       {
+                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                       },
                MovieSearchParams = new List<MovieSearchParam>
-                {
-                    MovieSearchParam.Q, MovieSearchParam.ImdbId
-                },
+                       {
+                           MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
                MusicSearchParams = new List<MusicSearchParam>
-                {
-                    MusicSearchParam.Q
-                },
+                       {
+                           MusicSearchParam.Q
+                       },
                BookSearchParams = new List<BookSearchParam>
-                {
-                    BookSearchParam.Q
-                },
+                       {
+                           BookSearchParam.Q
+                       },
                Flags = new List<IndexerFlag>
                {
-                    IndexerFlag.FreeLeech,
-                    IndexerFlag.Internal,
+                    IndexerFlag.FreeLeech
                }
            };

@@ -54,7 +53,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
            _movieSearchCriteria = new MovieSearchCriteria
            {
                SearchTerm = "Star Wars",
-                Categories = new[] { 2000 }
+                Categories = new int[] { 2000 }
            };
        }

@@ -66,13 +65,13 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
        [Test]
        public void should_use_categories_for_feed()
        {
-            var results = Subject.GetSearchRequests(new MovieSearchCriteria { Categories = new[] { NewznabStandardCategory.MoviesSD.Id, NewznabStandardCategory.MoviesDVD.Id } });
+            var results = Subject.GetSearchRequests(new MovieSearchCriteria { Categories = new int[] { NewznabStandardCategory.MoviesSD.Id, NewznabStandardCategory.MoviesDVD.Id } });

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

-            page.Url.Query.Should().Contain("&category=1%2C2");
+            page.Url.Query.Should().Contain("&category=1,2&");
        }

        [Test]
@@ -81,9 +80,9 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
            _movieSearchCriteria.ImdbId = "0076759";
            var results = Subject.GetSearchRequests(_movieSearchCriteria);

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().Contain("type=imdb");
            page.Url.Query.Should().Contain("query=tt0076759");
@@ -96,12 +95,12 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests

            var results = Subject.GetSearchRequests(_movieSearchCriteria);

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().Contain("type=name");
-            page.Url.Query.Should().Contain("query=Star+Wars");
+            page.Url.Query.Should().Contain("query=Star Wars");
        }
    }
 }
--- a/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs
@@ -10,7 +10,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions.HDBits;
+using NzbDrone.Core.Indexers.HDBits;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
--- a/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions.HDBits;
+using NzbDrone.Core.Indexers.HDBits;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -14,13 +14,11 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
    public class HDBitsRequestGeneratorFixture : CoreTest<HDBitsRequestGenerator>
    {
        private MovieSearchCriteria _movieSearchCriteria;
-        private TvSearchCriteria _tvSearchSeasonEpisodeCriteria;
-        private TvSearchCriteria _tvSearchDailyEpisodeCriteria;

        [SetUp]
        public void Setup()
        {
-            Subject.Settings = new HDBitsSettings
+            Subject.Settings = new HDBitsSettings()
            {
                ApiKey = "abcd",
                Username = "somename"
@@ -49,25 +47,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests

            _movieSearchCriteria = new MovieSearchCriteria
            {
-                Categories = new[] { 2000, 2010 },
+                Categories = new int[] { 2000, 2010 },
                ImdbId = "0076759"
            };
-
-            _tvSearchSeasonEpisodeCriteria = new TvSearchCriteria
-            {
-                Categories = new[] { 5000, 5010 },
-                TvdbId = 392256,
-                Season = 1,
-                Episode = "3"
-            };
-
-            _tvSearchDailyEpisodeCriteria = new TvSearchCriteria
-            {
-                Categories = new[] { 5000, 5010 },
-                TvdbId = 289574,
-                Season = 2023,
-                Episode = "01/03"
-            };
        }

        [Test]
@@ -76,9 +58,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
            var results = Subject.GetSearchRequests(_movieSearchCriteria);
            var imdbQuery = int.Parse(_movieSearchCriteria.ImdbId);

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);

@@ -88,49 +70,5 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
            query.Category.Should().HaveCount(1);
            query.ImdbInfo.Id.Should().Be(imdbQuery);
        }
-
-        [Test]
-        public void should_search_by_tvdbid_season_episode_if_supported()
-        {
-            var results = Subject.GetSearchRequests(_tvSearchSeasonEpisodeCriteria);
-            var tvdbQuery = _tvSearchSeasonEpisodeCriteria.TvdbId;
-
-            results.Should().HaveCount(1);
-
-            var page = results.First();
-
-            var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
-
-            var body = encoding.GetString(page.HttpRequest.ContentData);
-            var query = JsonConvert.DeserializeObject<TorrentQuery>(body);
-
-            query.Category.Should().HaveCount(3);
-            query.TvdbInfo.Id.Should().Be(tvdbQuery);
-            query.Search.Should().BeNullOrWhiteSpace();
-            query.TvdbInfo.Season.Should().Be(1);
-            query.TvdbInfo.Episode.Should().Be("3");
-        }
-
-        [Test]
-        public void should_search_by_tvdbid_daily_episode_if_supported()
-        {
-            var results = Subject.GetSearchRequests(_tvSearchDailyEpisodeCriteria);
-            var tvdbQuery = _tvSearchDailyEpisodeCriteria.TvdbId;
-
-            results.Should().HaveCount(1);
-
-            var page = results.First();
-
-            var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
-
-            var body = encoding.GetString(page.HttpRequest.ContentData);
-            var query = JsonConvert.DeserializeObject<TorrentQuery>(body);
-
-            query.Category.Should().HaveCount(3);
-            query.TvdbInfo.Id.Should().Be(tvdbQuery);
-            query.Search.Should().Be("2023-01-03");
-            query.TvdbInfo.Season.Should().BeNull();
-            query.TvdbInfo.Episode.Should().BeNull();
-        }
    }
 }
--- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Xml;
@@ -16,14 +15,14 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
    [TestFixture]
    public class NewznabCapabilitiesProviderFixture : CoreTest<NewznabCapabilitiesProvider>
    {
-        private NewznabSettings _settings;
+        private GenericNewznabSettings _settings;
        private IndexerDefinition _definition;
        private string _caps;

        [SetUp]
        public void SetUp()
        {
-            _settings = new NewznabSettings()
+            _settings = new GenericNewznabSettings()
            {
                BaseUrl = "http://indxer.local"
            };
@@ -71,45 +70,6 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            caps.LimitsMax.Value.Should().Be(60);
        }

-        [Test]
-        public void should_map_different_categories()
-        {
-            GivenCapsResponse(_caps);
-
-            var caps = Subject.GetCapabilities(_settings, _definition);
-
-            var bookCats = caps.Categories.MapTorznabCapsToTrackers(new int[] { NewznabStandardCategory.Books.Id });
-
-            bookCats.Count.Should().Be(2);
-            bookCats.Should().Contain("8000");
-        }
-
-        [Test]
-        public void should_find_sub_categories_as_main_categories()
-        {
-            GivenCapsResponse(ReadAllText("Files/Indexers/Torznab/torznab_animetosho_caps.xml"));
-
-            var caps = Subject.GetCapabilities(_settings, _definition);
-
-            var bookCats = caps.Categories.MapTrackerCatToNewznab("5070");
-
-            bookCats.Count.Should().Be(2);
-            bookCats.First().Id.Should().Be(5070);
-        }
-
-        [Test]
-        public void should_map_by_name_when_available()
-        {
-            GivenCapsResponse(_caps);
-
-            var caps = Subject.GetCapabilities(_settings, _definition);
-
-            var bookCats = caps.Categories.MapTrackerCatToNewznab("5999");
-
-            bookCats.Count.Should().Be(2);
-            bookCats.First().Id.Should().Be(5050);
-        }
-
        [Test]
        public void should_use_default_pagesize_if_missing()
        {
--- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests

            _caps = new IndexerCapabilities();
            Mocker.GetMock<INewznabCapabilitiesProvider>()
-                .Setup(v => v.GetCapabilities(It.IsAny<NewznabSettings>(), It.IsAny<IndexerDefinition>()))
+                .Setup(v => v.GetCapabilities(It.IsAny<GenericNewznabSettings>(), It.IsAny<IndexerDefinition>()))
                .Returns(_caps);
        }

--- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs
@@ -10,7 +10,7 @@ using NzbDrone.Core.Test.Framework;

 namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 {
-    public class NewznabRequestGeneratorFixture : CoreTest<NewznabRequestGenerator>
+    public class NewznabRequestGeneratorFixture : CoreTest<GenericNewznabRequestGenerator>
    {
        private MovieSearchCriteria _movieSearchCriteria;
        private TvSearchCriteria _tvSearchCriteria;
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
        [SetUp]
        public void SetUp()
        {
-            Subject.Settings = new NewznabSettings()
+            Subject.Settings = new GenericNewznabSettings()
            {
                BaseUrl = "http://127.0.0.1:1234/",
                ApiKey = "abcd",
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities = new IndexerCapabilities();

            Mocker.GetMock<INewznabCapabilitiesProvider>()
-                .Setup(v => v.GetCapabilities(It.IsAny<NewznabSettings>(), It.IsAny<IndexerDefinition>()))
+                .Setup(v => v.GetCapabilities(It.IsAny<GenericNewznabSettings>(), It.IsAny<IndexerDefinition>()))
                .Returns(_capabilities);
        }

@@ -51,9 +51,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _movieSearchCriteria.Offset = 0;
            var results = Subject.GetSearchRequests(_movieSearchCriteria);

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var pages = results.Take(3).ToList();
+            var pages = results.GetAllTiers().First().Take(3).ToList();

            pages[0].Url.FullUri.Should().Contain("&offset=0");
        }
@@ -63,9 +63,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
        {
            var results = Subject.GetSearchRequests(_movieSearchCriteria);

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var pages = results.Take(500).ToList();
+            var pages = results.GetAllTiers().First().Take(500).ToList();

            pages.Count.Should().BeLessThan(500);
        }
@@ -77,9 +77,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests

            var results = Subject.GetSearchRequests(_movieSearchCriteria);

-            results.Should().HaveCount(1);
+            results.GetAllTiers().Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().NotContain("imdbid=0076759");
            page.Url.Query.Should().Contain("q=Star");
@@ -92,9 +92,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId };

            var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Should().HaveCount(1);
+            results.GetTier(0).Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().Contain("imdbid=0076759");
        }
@@ -106,9 +106,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.TmdbId };

            var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Should().HaveCount(1);
+            results.GetTier(0).Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().Contain("tmdbid=11");
        }
@@ -120,9 +120,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId };

            var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Should().HaveCount(1);
+            results.GetTier(0).Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().Contain("tmdbid=11");
            page.Url.Query.Should().NotContain("imdbid=0076759");
@@ -136,9 +136,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId };

            var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Should().HaveCount(1);
+            results.GetTier(0).Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetTier(0).First().First();

            page.Url.Query.Should().Contain("tmdbid=11");
            page.Url.Query.Should().Contain("imdbid=0076759");
@@ -150,9 +150,10 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q };

            var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Should().HaveCount(1);
+            results.Tiers.Should().Be(1);
+            results.GetTier(0).Should().HaveCount(1);

-            var page = results.First();
+            var page = results.GetTier(0).First().First();

            page.Url.Query.Should().Contain("q=");
        }
@@ -166,7 +167,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests

            var results = Subject.GetSearchRequests(_movieSearchCriteria);

-            var page = results.First();
+            var page = results.GetTier(0).First().First();

            page.Url.Query.Should().Contain("q=");
        }
@@ -177,9 +178,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId };

            var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Should().HaveCount(1);
+            results.Tiers.Should().Be(1);

-            var pageTier2 = results.First();
+            var pageTier2 = results.GetTier(0).First().First();

            pageTier2.Url.Query.Should().NotContain("tmdbid=11");
            pageTier2.Url.Query.Should().NotContain("imdbid=0076759");
@@ -192,9 +193,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            _capabilities.TvSearchParams = new List<TvSearchParam> { TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep };

            var results = Subject.GetSearchRequests(_tvSearchCriteria);
-            results.Should().HaveCount(1);
+            results.Tiers.Should().Be(1);

-            var pageTier = results.First();
+            var pageTier = results.GetTier(0).First().First();

            pageTier.Url.Query.Should().Contain("season=00");
        }
--- a/src/NzbDrone.Core.Test/IndexerTests/OrpheusTests/OrpheusFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/OrpheusTests/OrpheusFixture.cs
@@ -9,7 +9,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Definitions;
-using NzbDrone.Core.Indexers.Definitions.Gazelle;
+using NzbDrone.Core.Indexers.Gazelle;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -24,12 +24,12 @@ namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
            Subject.Definition = new IndexerDefinition()
            {
                Name = "Orpheus",
-                Settings = new OrpheusSettings { Apikey = "somekey" }
+                Settings = new OrpheusSettings() { Apikey = "somekey" }
            };
        }

        [Test]
-        public async Task should_parse_recent_feed_from_Orpheus()
+        public async Task should_parse_recent_feed_from_GazelleGames()
        {
            var recentFeed = ReadAllText(@"Files/Indexers/Orpheus/recentfeed.json");

@@ -37,14 +37,14 @@ namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
                .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));

-            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 2000 } })).Releases;
+            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new int[] { 2000 } })).Releases;

            releases.Should().HaveCount(65);
            releases.First().Should().BeOfType<GazelleInfo>();

            var torrentInfo = releases.First() as GazelleInfo;

-            torrentInfo.Title.Should().Be("The Beatles - Abbey Road [1969] [Album] [2.0 Mix 2019] [MP3 V2 (VBR)] [BD]");
+            torrentInfo.Title.Should().Be("The Beatles - Abbey Road (1969) [MP3 V2 (VBR)] [BD]");
            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
            torrentInfo.DownloadUrl.Should().Be("https://orpheus.network/ajax.php?action=download&id=1902448");
            torrentInfo.InfoUrl.Should().Be("https://orpheus.network/torrents.php?id=466&torrentid=1902448");
--- a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
@@ -9,7 +9,7 @@ using NUnit.Framework;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions.Rarbg;
+using NzbDrone.Core.Indexers.Rarbg;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
@@ -23,14 +23,14 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
        [SetUp]
        public void Setup()
        {
-            Subject.Definition = new IndexerDefinition
+            Subject.Definition = new IndexerDefinition()
            {
                Name = "Rarbg",
                Settings = new RarbgSettings()
            };

            Mocker.GetMock<IRarbgTokenProvider>()
-                .Setup(v => v.GetToken(It.IsAny<RarbgSettings>(), Subject.RateLimit))
+                .Setup(v => v.GetToken(It.IsAny<RarbgSettings>()))
                .Returns("validtoken");
        }

@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
            torrentInfo.Title.Should().Be("Sense8.S01E01.WEBRip.x264-FGT");
            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
            torrentInfo.DownloadUrl.Should().Be("magnet:?xt=urn:btih:d8bde635f573acb390c7d7e7efc1556965fdc802&dn=Sense8.S01E01.WEBRip.x264-FGT&tr=http%3A%2F%2Ftracker.trackerfix.com%3A80%2Fannounce&tr=udp%3A%2F%2F9.rarbg.me%3A2710&tr=udp%3A%2F%2F9.rarbg.to%3A2710&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce");
-            torrentInfo.InfoUrl.Should().Be($"https://torrentapi.org/redirect_to_info.php?token=i5cx7b9agd&p=8_6_4_4_5_6__d8bde635f5&app_id=rralworP_{BuildInfo.Version}");
+            torrentInfo.InfoUrl.Should().Be($"https://torrentapi.org/redirect_to_info.php?token=i5cx7b9agd&p=8_6_4_4_5_6__d8bde635f5&app_id={BuildInfo.AppName}");
            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2015-06-05 16:58:11 +0000").ToUniversalTime());
            torrentInfo.Size.Should().Be(564198371);
--- a/src/NzbDrone.Core.Test/IndexerTests/SecretCinemaTests/SecretCinemaFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/SecretCinemaTests/SecretCinemaFixture.cs
@@ -1,68 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions;
-using NzbDrone.Core.Indexers.Definitions.Gazelle;
-using NzbDrone.Core.IndexerSearch.Definitions;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.IndexerTests.SecretCinemaTests
-{
-    [TestFixture]
-    public class SecretCinemaFixture : CoreTest<SecretCinema>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-            {
-                Name = "SecretCinema",
-                Settings = new GazelleSettings() { Username = "somekey", Password = "somekey" }
-            };
-        }
-
-        [Test]
-        public async Task should_parse_recent_feed_from_SecretCinema()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/SecretCinema/recentfeed.json");
-
-            Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
-                .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
-
-            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new int[] { 2000 } })).Releases;
-
-            releases.Should().HaveCount(3);
-            releases.First().Should().BeOfType<GazelleInfo>();
-
-            var torrentInfo = releases.First() as GazelleInfo;
-
-            torrentInfo.Title.Should().Be("Singin' in the Rain (1952) 2160p");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("https://secret-cinema.pw/torrents.php?action=download&useToken=0&id=45068");
-            torrentInfo.InfoUrl.Should().Be("https://secret-cinema.pw/torrents.php?id=2497&torrentid=45068");
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2022-12-15 19:37:29"));
-            torrentInfo.Size.Should().Be(57473058680);
-            torrentInfo.InfoHash.Should().Be(null);
-            torrentInfo.MagnetUrl.Should().Be(null);
-            torrentInfo.Peers.Should().Be(8);
-            torrentInfo.Seeders.Should().Be(8);
-            torrentInfo.ImdbId.Should().Be(0);
-            torrentInfo.TmdbId.Should().Be(0);
-            torrentInfo.TvdbId.Should().Be(0);
-            torrentInfo.Languages.Should().HaveCount(0);
-            torrentInfo.Subs.Should().HaveCount(0);
-            torrentInfo.DownloadVolumeFactor.Should().Be(0);
-            torrentInfo.UploadVolumeFactor.Should().Be(1);
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
@@ -34,12 +34,8 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
            };

            _caps = new IndexerCapabilities();
-
-            _caps.Categories.AddCategoryMapping(2000, NewznabStandardCategory.Movies, "Movies");
-            _caps.Categories.AddCategoryMapping(2040, NewznabStandardCategory.MoviesHD, "Movies/HD");
-
            Mocker.GetMock<INewznabCapabilitiesProvider>()
-                .Setup(v => v.GetCapabilities(It.IsAny<NewznabSettings>(), It.IsAny<IndexerDefinition>()))
+                .Setup(v => v.GetCapabilities(It.IsAny<GenericNewznabSettings>(), It.IsAny<IndexerDefinition>()))
                .Returns(_caps);
        }

@@ -133,38 +129,6 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
            releaseInfo.Peers.Should().BeNull();
        }

-        [Test]
-        public async Task should_parse_recent_feed_from_torznab_morethantv()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_morethantv.xml");
-
-            Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
-                .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
-
-            var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;
-
-            releases.Should().HaveCount(2);
-
-            releases.First().Should().BeOfType<TorrentInfo>();
-            var releaseInfo = releases.First() as TorrentInfo;
-
-            releaseInfo.Title.Should().Be("Out of the Past 1947 720p BluRay FLAC2.0 x264-CtrlHD.mkv");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            releaseInfo.DownloadUrl.Should().Be("https://www.morethantv.me/torrents.php?action=download&id=(removed)&authkey=(removed)&torrent_pass=(removed)");
-            releaseInfo.InfoUrl.Should().Be("https://www.morethantv.me/torrents.php?id=(removed)&torrentid=836164");
-            releaseInfo.CommentUrl.Should().Be("https://www.morethantv.me/torrents.php?id=(removed)&torrentid=836164");
-            releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
-            releaseInfo.PublishDate.Should().Be(DateTime.Parse("Tue, 20 Dec 2022 21:32:17 +0000").ToUniversalTime());
-            releaseInfo.Size.Should().Be(5412993028);
-            releaseInfo.TvdbId.Should().Be(0);
-            releaseInfo.TvRageId.Should().Be(0);
-            releaseInfo.InfoHash.Should().Be("(removed)");
-            releaseInfo.Seeders.Should().Be(3);
-            releaseInfo.Peers.Should().Be(3);
-            releaseInfo.Categories.Count.Should().Be(4);
-        }
-
        [Test]
        public void should_use_pagesize_reported_by_caps()
        {
--- a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using FluentValidation.Results;
 using NUnit.Framework;
@@ -55,11 +56,6 @@ namespace NzbDrone.Core.Test.NotificationTests
            {
                TestLogger.Info("OnApplicationUpdate was called");
            }
-
-            public override void OnGrab(GrabMessage message)
-            {
-                TestLogger.Info("OnGrab was called");
-            }
        }

        private class TestNotificationWithNoEvents : NotificationBase<TestSetting>
@@ -80,7 +76,6 @@ namespace NzbDrone.Core.Test.NotificationTests

            notification.SupportsOnHealthIssue.Should().BeTrue();
            notification.SupportsOnApplicationUpdate.Should().BeTrue();
-            notification.SupportsOnGrab.Should().BeTrue();
        }

        [Test]
@@ -90,7 +85,6 @@ namespace NzbDrone.Core.Test.NotificationTests

            notification.SupportsOnHealthIssue.Should().BeFalse();
            notification.SupportsOnApplicationUpdate.Should().BeFalse();
-            notification.SupportsOnGrab.Should().BeFalse();
        }
    }
 }
--- a/Show More
+++ b/Show More