From 9fe13a2d14d661f332379e58b1b1254c4651533e Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 23 Jan 2022 23:42:41 -0600
Subject: [PATCH] New: Custom Formats

Co-Authored-By: ta264 <ta264@users.noreply.github.com>
---
 frontend/build/webpack.config.js              |   3 +-
 .../src/Activity/Blocklist/BlocklistRow.js    |  13 +
 .../History/Details/HistoryDetails.js         |  43 +-
 frontend/src/Activity/History/HistoryRow.css  |   6 +
 frontend/src/Activity/History/HistoryRow.js   |  25 +
 frontend/src/Activity/Queue/QueueRow.js       |  13 +
 frontend/src/Album/AlbumFormats.js            |  33 ++
 frontend/src/App/AppRoutes.js                 |   6 +
 .../src/Components/Form/FormInputGroup.js     |   4 +
 frontend/src/Components/Form/TextArea.css     |  19 +
 frontend/src/Components/Form/TextArea.js      | 172 +++++++
 .../Components/Form/TextTagInputConnector.js  |   6 +-
 .../src/Components/Link/ClipboardButton.js    |  16 +-
 .../Components/Page/Sidebar/PageSidebar.js    |   4 +
 .../Table/TableOptions/TableOptionsModal.js   |   4 +-
 frontend/src/Helpers/Props/icons.js           |   2 +
 frontend/src/Helpers/Props/inputTypes.js      |   2 +
 .../InteractiveImportModalContent.js          |   9 +
 .../Interactive/InteractiveImportRow.css      |   4 +
 .../Interactive/InteractiveImportRow.js       |  24 +-
 .../InteractiveSearch/InteractiveSearch.js    |   4 +-
 .../InteractiveSearchRow.css                  |   2 +-
 .../InteractiveSearch/InteractiveSearchRow.js |  20 +-
 .../CustomFormatSettingsConnector.js          |  32 ++
 .../CustomFormats/CustomFormat.css            |  49 ++
 .../CustomFormats/CustomFormat.js             | 174 +++++++
 .../CustomFormats/CustomFormats.css           |  21 +
 .../CustomFormats/CustomFormats.js            | 115 +++++
 .../CustomFormats/CustomFormatsConnector.js   |  63 +++
 .../CustomFormats/EditCustomFormatModal.js    |  61 +++
 .../EditCustomFormatModalConnector.js         |  43 ++
 .../EditCustomFormatModalContent.css          |  27 ++
 .../EditCustomFormatModalContent.js           | 256 +++++++++++
 .../EditCustomFormatModalContentConnector.js  | 102 +++++
 .../CustomFormats/ExportCustomFormatModal.js  |  61 +++
 .../ExportCustomFormatModalContent.css        |   5 +
 .../ExportCustomFormatModalContent.js         |  84 ++++
 ...ExportCustomFormatModalContentConnector.js |  83 ++++
 .../CustomFormats/ImportCustomFormatModal.js  |  61 +++
 .../ImportCustomFormatModalContent.css        |   5 +
 .../ImportCustomFormatModalContent.js         | 151 ++++++
 ...ImportCustomFormatModalContentConnector.js | 145 ++++++
 .../Specifications/AddSpecificationItem.css   |  44 ++
 .../Specifications/AddSpecificationItem.js    | 110 +++++
 .../Specifications/AddSpecificationModal.js   |  25 +
 .../AddSpecificationModalContent.css          |   5 +
 .../AddSpecificationModalContent.js           | 101 ++++
 .../AddSpecificationModalContentConnector.js  |  70 +++
 .../AddSpecificationPresetMenuItem.js         |  49 ++
 .../Specifications/EditSpecificationModal.js  |  27 ++
 .../EditSpecificationModalConnector.js        |  50 ++
 .../EditSpecificationModalContent.css         |   5 +
 .../EditSpecificationModalContent.js          | 160 +++++++
 .../EditSpecificationModalContentConnector.js |  78 ++++
 .../Specifications/Specification.css          |  38 ++
 .../Specifications/Specification.js           | 139 ++++++
 .../MediaManagement/MediaManagement.js        |   2 +-
 .../MediaManagement/Naming/NamingModal.js     |   2 +-
 .../Delay/EditDelayProfileModalContent.js     |  53 ++-
 .../EditQualityProfileModalContent.css        |  17 +-
 .../Quality/EditQualityProfileModalContent.js |  66 ++-
 ...EditQualityProfileModalContentConnector.js |  48 +-
 .../Quality/QualityProfileFormatItem.css      |  45 ++
 .../Quality/QualityProfileFormatItem.js       |  68 +++
 .../Quality/QualityProfileFormatItems.css     |  31 ++
 .../Quality/QualityProfileFormatItems.js      | 159 +++++++
 .../Release/EditReleaseProfileModalContent.js |  40 +-
 ...EditReleaseProfileModalContentConnector.js |   5 +-
 .../Profiles/Release/ReleaseProfile.css       |   6 +
 .../Profiles/Release/ReleaseProfile.js        |  48 +-
 frontend/src/Settings/Settings.js             |  11 +
 .../Settings/customFormatSpecifications.js    | 193 ++++++++
 .../Store/Actions/Settings/customFormats.js   | 108 +++++
 .../src/Store/Actions/blocklistActions.js     |   6 +
 frontend/src/Store/Actions/historyActions.js  |  24 +-
 frontend/src/Store/Actions/queueActions.js    |   6 +
 frontend/src/Store/Actions/releaseActions.js  |   5 +
 frontend/src/Store/Actions/settingsActions.js |  10 +
 .../Number/formatPreferredWordScore.js        |  16 +
 frontend/src/Utilities/State/getNextId.js     |   5 +
 .../src/Utilities/State/getProviderState.js   |  17 +-
 package.json                                  |   1 +
 .../Blocklist/BlocklistController.cs          |   8 +-
 .../Blocklist/BlocklistResource.cs            |   6 +-
 .../CustomFormats/CustomFormatController.cs   | 115 +++++
 .../CustomFormats/CustomFormatResource.cs     |  75 +++
 .../CustomFormatSpecificationSchema.cs        |  36 ++
 .../History/HistoryController.cs              |   6 +-
 src/Lidarr.Api.V1/History/HistoryResource.cs  |   6 +-
 src/Lidarr.Api.V1/Indexers/ReleaseResource.cs |   7 +-
 .../Profiles/Delay/DelayProfileResource.cs    |  11 +-
 .../Quality/QualityProfileController.cs       |  22 +-
 .../Quality/QualityProfileResource.cs         |  41 +-
 .../Release/ReleaseProfileController.cs       |   7 +-
 .../Release/ReleaseProfileResource.cs         |  10 +-
 src/Lidarr.Api.V1/Queue/QueueResource.cs      |   3 +
 src/Lidarr.Http/ClientSchema/Field.cs         |   1 +
 src/Lidarr.Http/REST/RestResource.cs          |   2 +-
 .../CustomFormats/CustomFormatsTestHelpers.cs |  32 ++
 .../063_add_custom_formatsFixture.cs          | 431 ++++++++++++++++++
 ...matAllowedByProfileSpecificationFixture.cs | 116 +++++
 .../CutoffSpecificationFixture.cs             |  34 +-
 .../PrioritizeDownloadDecisionFixture.cs      |  26 +-
 .../QueueSpecificationFixture.cs              |  45 +-
 ...ReleaseRestrictionsSpecificationFixture.cs |  19 +-
 .../RssSync/DelaySpecificationFixture.cs      |  58 ++-
 .../HistorySpecificationFixture.cs            |  18 +-
 .../UpgradeAllowedSpecificationFixture.cs     | 192 ++++++--
 .../UpgradeDiskSpecificationFixture.cs        |  23 +-
 .../UpgradeSpecificationFixture.cs            |  15 +-
 .../PendingReleaseServiceTests/AddFixture.cs  |   1 +
 .../RemovePendingFixture.cs                   |   4 +-
 ...CleanupQualityProfileFormatItemsFixture.cs | 134 ++++++
 .../TrackImport/GetSceneNameFixture.cs        | 143 ++++++
 .../SameFileSpecificationFixture.cs           | 109 -----
 .../FileNameBuilderTests/CleanTitleFixture.cs |   5 +
 .../FileNameBuilderFixture.cs                 |   6 +-
 .../FileNameBuilderTests/TitleTheFixture.cs   |   5 +
 ...ure.cs => QualityProfileServiceFixture.cs} |   8 +-
 .../PreferredWordService/CalculateFixture.cs  |  94 ----
 .../GetMatchingPreferredWordsFixture.cs       |  77 ----
 src/NzbDrone.Core/Annotations/SelectOption.cs |  10 +
 .../Annotations/SelectOptionsConverter.cs     |   9 +
 .../CustomFormats/CustomFormat.cs             |  71 +++
 .../CustomFormatCalculationService.cs         | 183 ++++++++
 .../CustomFormats/CustomFormatInput.cs        |  38 ++
 .../CustomFormats/CustomFormatRepository.cs   |  17 +
 .../CustomFormats/CustomFormatService.cs      |  77 ++++
 .../Events/CustomFormatAddedEvent.cs          |  14 +
 .../Events/CustomFormatDeletedEvent.cs        |  14 +
 .../SpecificationMatchesGroup.cs              |  13 +
 .../CustomFormatSpecificationBase.cs          |  36 ++
 .../ICustomFormatSpecification.cs             |  20 +
 .../Specifications/RegexSpecificationBase.cs  |  54 +++
 .../ReleaseGroupSpecification.cs              |  14 +
 .../ReleaseTitleSpecification.cs              |  14 +
 .../Specifications/SizeSpecification.cs       |  41 ++
 .../Converters/CustomFormatIntConverter.cs    |  20 +
 .../CustomFormatSpecificationConverter.cs     |  74 +++
 .../Migration/063_add_custom_formats.cs       | 307 +++++++++++++
 src/NzbDrone.Core/Datastore/TableMapping.cs   |   6 +
 .../DownloadDecisionComparer.cs               |   6 +-
 .../DecisionEngine/DownloadDecisionMaker.cs   |  93 ++--
 ...stomFormatAllowedByProfileSpecification.cs |  25 +
 .../Specifications/CutoffSpecification.cs     |  14 +-
 .../Specifications/QueueSpecification.cs      |  28 +-
 .../ReleaseRestrictionsSpecification.cs       |   8 +-
 .../RssSync/DelaySpecification.cs             |  28 +-
 .../RssSync/HistorySpecification.cs           |  30 +-
 .../Specifications/UpgradableSpecification.cs |  54 ++-
 .../UpgradeAllowedSpecification.cs            |  15 +-
 .../UpgradeDiskSpecification.cs               |  14 +-
 .../AggregatePreferredWordScore.cs            |  22 -
 .../History/DownloadHistoryService.cs         |   2 +-
 .../Download/Pending/PendingReleaseService.cs |  11 +
 .../TrackedDownloadService.cs                 |  12 +-
 .../History/EntityHistoryService.cs           |   1 +
 .../CleanupQualityProfileFormatItems.cs       |  93 ++++
 src/NzbDrone.Core/Localization/Core/en.json   |  10 +-
 .../DownloadedTracksImportService.cs          |  21 +-
 src/NzbDrone.Core/MediaFiles/TrackFile.cs     |   3 +-
 .../Aggregation/AggregationService.cs         |   6 +-
 .../Aggregators/AggregateQuality.cs           |   2 +-
 .../Aggregators/AggregateReleaseGroup.cs      |   2 +-
 .../TrackImport/ImportApprovedTracks.cs       |  38 +-
 .../TrackImport/ImportDecisionMaker.cs        |   8 +-
 .../TrackImport/Manual/ManualImportItem.cs    |   3 +
 .../TrackImport/Manual/ManualImportService.cs |   8 +-
 .../TrackImport/SceneNameCalculator.cs        |  38 ++
 .../Specifications/SameFileSpecification.cs   |  53 ---
 .../Specifications/UpgradeSpecification.cs    |   7 +-
 .../Notifications/Webhook/WebhookRelease.cs   |   6 +
 .../Organizer/FileNameBuilder.cs              |  22 +-
 .../Organizer/FileNameSampleService.cs        |  24 +-
 src/NzbDrone.Core/Parser/Model/LocalTrack.cs  |   3 +-
 .../Parser/Model/ParsedAlbumInfo.cs           |   6 +
 src/NzbDrone.Core/Parser/Model/RemoteAlbum.cs |   5 +-
 .../Profiles/Delay/DelayProfile.cs            |   5 +-
 .../Profiles/ProfileFormatItem.cs             |  11 +
 .../Profiles/Qualities/QualityProfile.cs      |  14 +
 .../Qualities/QualityProfileRepository.cs     |  40 +-
 .../Qualities/QualityProfileService.cs        |  55 ++-
 .../Profiles/Releases/PreferredWordService.cs |  86 ----
 .../Profiles/Releases/ReleaseProfile.cs       |  10 +-
 .../Releases/ReleaseProfileService.cs         |   8 -
 .../CaseInsensitiveTermMatcher.cs             |   4 +-
 yarn.lock                                     |  37 +-
 187 files changed, 6947 insertions(+), 892 deletions(-)
 create mode 100644 frontend/src/Album/AlbumFormats.js
 create mode 100644 frontend/src/Components/Form/TextArea.css
 create mode 100644 frontend/src/Components/Form/TextArea.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModal.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContentConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModal.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModal.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContentConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationPresetMenuItem.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.css
 create mode 100644 frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js
 create mode 100644 frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.css
 create mode 100644 frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.js
 create mode 100644 frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.css
 create mode 100644 frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js
 create mode 100644 frontend/src/Store/Actions/Settings/customFormatSpecifications.js
 create mode 100644 frontend/src/Store/Actions/Settings/customFormats.js
 create mode 100644 frontend/src/Utilities/Number/formatPreferredWordScore.js
 create mode 100644 frontend/src/Utilities/State/getNextId.js
 create mode 100644 src/Lidarr.Api.V1/CustomFormats/CustomFormatController.cs
 create mode 100644 src/Lidarr.Api.V1/CustomFormats/CustomFormatResource.cs
 create mode 100644 src/Lidarr.Api.V1/CustomFormats/CustomFormatSpecificationSchema.cs
 create mode 100644 src/NzbDrone.Core.Test/CustomFormats/CustomFormatsTestHelpers.cs
 create mode 100644 src/NzbDrone.Core.Test/Datastore/Migration/063_add_custom_formatsFixture.cs
 create mode 100644 src/NzbDrone.Core.Test/DecisionEngineTests/CustomFormatAllowedByProfileSpecificationFixture.cs
 rename src/NzbDrone.Core.Test/DecisionEngineTests/{ => RssSync}/HistorySpecificationFixture.cs (93%)
 create mode 100644 src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupQualityProfileFormatItemsFixture.cs
 create mode 100644 src/NzbDrone.Core.Test/MediaFiles/TrackImport/GetSceneNameFixture.cs
 delete mode 100644 src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/SameFileSpecificationFixture.cs
 rename src/NzbDrone.Core.Test/Profiles/{ProfileServiceFixture.cs => QualityProfileServiceFixture.cs} (95%)
 delete mode 100644 src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/CalculateFixture.cs
 delete mode 100644 src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs
 create mode 100644 src/NzbDrone.Core/Annotations/SelectOption.cs
 create mode 100644 src/NzbDrone.Core/Annotations/SelectOptionsConverter.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/CustomFormat.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/CustomFormatInput.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/CustomFormatRepository.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/CustomFormatService.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Events/CustomFormatAddedEvent.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Events/CustomFormatDeletedEvent.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
 create mode 100644 src/NzbDrone.Core/Datastore/Converters/CustomFormatIntConverter.cs
 create mode 100644 src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/063_add_custom_formats.cs
 create mode 100644 src/NzbDrone.Core/DecisionEngine/Specifications/CustomFormatAllowedByProfileSpecification.cs
 delete mode 100644 src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregatePreferredWordScore.cs
 create mode 100644 src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupQualityProfileFormatItems.cs
 create mode 100644 src/NzbDrone.Core/MediaFiles/TrackImport/SceneNameCalculator.cs
 delete mode 100644 src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/SameFileSpecification.cs
 create mode 100644 src/NzbDrone.Core/Profiles/ProfileFormatItem.cs
 delete mode 100644 src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs

diff --git a/frontend/build/webpack.config.js b/frontend/build/webpack.config.js
index 6f324ac95..1c86e39d4 100644
--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -44,7 +44,8 @@ module.exports = (env) => {
         'node_modules'
       ],
       alias: {
-        jquery: 'jquery/src/jquery'
+        jquery: 'jquery/src/jquery',
+        'react-middle-truncate': 'react-middle-truncate/lib/react-middle-truncate'
       },
       fallback: {
         buffer: false,
diff --git a/frontend/src/Activity/Blocklist/BlocklistRow.js b/frontend/src/Activity/Blocklist/BlocklistRow.js
index 3fc813196..9dcfc47cd 100644
--- a/frontend/src/Activity/Blocklist/BlocklistRow.js
+++ b/frontend/src/Activity/Blocklist/BlocklistRow.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import AlbumFormats from 'Album/AlbumFormats';
 import TrackQuality from 'Album/TrackQuality';
 import ArtistNameLink from 'Artist/ArtistNameLink';
 import IconButton from 'Components/Link/IconButton';
@@ -45,6 +46,7 @@ class BlocklistRow extends Component {
       artist,
       sourceTitle,
       quality,
+      customFormats,
       date,
       protocol,
       indexer,
@@ -110,6 +112,16 @@ class BlocklistRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <AlbumFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -174,6 +186,7 @@ BlocklistRow.propTypes = {
   artist: PropTypes.object.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   date: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
diff --git a/frontend/src/Activity/History/Details/HistoryDetails.js b/frontend/src/Activity/History/Details/HistoryDetails.js
index 0dae7c861..dd4c509a2 100644
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@@ -9,6 +9,7 @@ import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
+import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
 import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';
 
@@ -67,6 +68,7 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
+      customFormatScore,
       nzbInfoUrl,
       downloadClient,
       downloadClientName,
@@ -105,7 +107,16 @@ function HistoryDetails(props) {
         }
 
         {
-          !!nzbInfoUrl &&
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title="Custom Format Score"
+              data={formatPreferredWordScore(customFormatScore)}
+            /> :
+            null
+        }
+
+        {
+          nzbInfoUrl ?
             <span>
               <DescriptionListItemTitle>
                 Info URL
@@ -114,7 +125,8 @@ function HistoryDetails(props) {
               <DescriptionListItemDescription>
                 <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
               </DescriptionListItemDescription>
-            </span>
+            </span> :
+            null
         }
 
         {
@@ -179,6 +191,7 @@ function HistoryDetails(props) {
 
   if (eventType === 'trackFileImported') {
     const {
+      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -201,12 +214,22 @@ function HistoryDetails(props) {
         }
 
         {
-          !!importedPath &&
+          importedPath ?
             <DescriptionListItem
               descriptionClassName={styles.description}
               title={translate('ImportedTo')}
               data={importedPath}
-            />
+            /> :
+            null
+        }
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title="Custom Format Score"
+              data={formatPreferredWordScore(customFormatScore)}
+            /> :
+            null
         }
       </DescriptionList>
     );
@@ -214,7 +237,8 @@ function HistoryDetails(props) {
 
   if (eventType === 'trackFileDeleted') {
     const {
-      reason
+      reason,
+      customFormatScore
     } = data;
 
     let reasonMessage = '';
@@ -244,6 +268,15 @@ function HistoryDetails(props) {
           title={translate('Reason')}
           data={reasonMessage}
         />
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title="Custom Format Score"
+              data={formatPreferredWordScore(customFormatScore)}
+            /> :
+            null
+        }
       </DescriptionList>
     );
   }
diff --git a/frontend/src/Activity/History/HistoryRow.css b/frontend/src/Activity/History/HistoryRow.css
index 669377fdb..039804b63 100644
--- a/frontend/src/Activity/History/HistoryRow.css
+++ b/frontend/src/Activity/History/HistoryRow.css
@@ -10,6 +10,12 @@
   width: 80px;
 }
 
+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 55px;
+}
+
 .releaseGroup {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js
index 98718f70f..9bac266f4 100644
--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import AlbumFormats from 'Album/AlbumFormats';
 import AlbumTitleLink from 'Album/AlbumTitleLink';
 import TrackQuality from 'Album/TrackQuality';
 import ArtistNameLink from 'Artist/ArtistNameLink';
@@ -8,6 +9,7 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons } from 'Helpers/Props';
+import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -55,6 +57,7 @@ class HistoryRow extends Component {
       album,
       track,
       quality,
+      customFormats,
       qualityCutoffNotMet,
       eventType,
       sourceTitle,
@@ -136,6 +139,16 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <AlbumFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -167,6 +180,17 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  {formatPreferredWordScore(data.customFormatScore)}
+                </TableRowCell>
+              );
+            }
+
             if (name === 'releaseGroup') {
               return (
                 <TableRowCell
@@ -229,6 +253,7 @@ HistoryRow.propTypes = {
   album: PropTypes.object,
   track: PropTypes.object,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js
index 8f03e8622..23f9fe18e 100644
--- a/frontend/src/Activity/Queue/QueueRow.js
+++ b/frontend/src/Activity/Queue/QueueRow.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
+import AlbumFormats from 'Album/AlbumFormats';
 import AlbumTitleLink from 'Album/AlbumTitleLink';
 import TrackQuality from 'Album/TrackQuality';
 import ArtistNameLink from 'Artist/ArtistNameLink';
@@ -89,6 +90,7 @@ class QueueRow extends Component {
       artist,
       album,
       quality,
+      customFormats,
       protocol,
       indexer,
       outputPath,
@@ -214,6 +216,16 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <AlbumFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'protocol') {
               return (
                 <TableRowCell key={name}>
@@ -382,6 +394,7 @@ QueueRow.propTypes = {
   artist: PropTypes.object,
   album: PropTypes.object,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
diff --git a/frontend/src/Album/AlbumFormats.js b/frontend/src/Album/AlbumFormats.js
new file mode 100644
index 000000000..1591fa714
--- /dev/null
+++ b/frontend/src/Album/AlbumFormats.js
@@ -0,0 +1,33 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Label from 'Components/Label';
+import { kinds } from 'Helpers/Props';
+
+function AlbumFormats({ formats }) {
+  return (
+    <div>
+      {
+        formats.map((format) => {
+          return (
+            <Label
+              key={format.id}
+              kind={kinds.INFO}
+            >
+              {format.name}
+            </Label>
+          );
+        })
+      }
+    </div>
+  );
+}
+
+AlbumFormats.propTypes = {
+  formats: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+
+AlbumFormats.defaultProps = {
+  formats: []
+};
+
+export default AlbumFormats;
diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js
index 0285559a8..223e0f90e 100644
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -13,6 +13,7 @@ import CalendarPageConnector from 'Calendar/CalendarPageConnector';
 import NotFound from 'Components/NotFound';
 import Switch from 'Components/Router/Switch';
 import AddNewItemConnector from 'Search/AddNewItemConnector';
+import CustomFormatSettingsConnector from 'Settings/CustomFormats/CustomFormatSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
 import ImportListSettingsConnector from 'Settings/ImportLists/ImportListSettingsConnector';
@@ -167,6 +168,11 @@ function AppRoutes(props) {
         component={QualityConnector}
       />
 
+      <Route
+        path="/settings/customformats"
+        component={CustomFormatSettingsConnector}
+      />
+
       <Route
         path="/settings/indexers"
         component={IndexerSettingsConnector}
diff --git a/frontend/src/Components/Form/FormInputGroup.js b/frontend/src/Components/Form/FormInputGroup.js
index e1d4ec07c..ade8be204 100644
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -27,6 +27,7 @@ import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
 import SeriesTypeSelectInput from './SeriesTypeSelectInput';
 import TagInputConnector from './TagInputConnector';
 import TagSelectInputConnector from './TagSelectInputConnector';
+import TextArea from './TextArea';
 import TextInput from './TextInput';
 import TextTagInputConnector from './TextTagInputConnector';
 import UMaskInput from './UMaskInput';
@@ -100,6 +101,9 @@ function getComponent(type) {
     case inputTypes.TAG:
       return TagInputConnector;
 
+    case inputTypes.TEXT_AREA:
+      return TextArea;
+
     case inputTypes.TEXT_TAG:
       return TextTagInputConnector;
 
diff --git a/frontend/src/Components/Form/TextArea.css b/frontend/src/Components/Form/TextArea.css
new file mode 100644
index 000000000..7a4961c07
--- /dev/null
+++ b/frontend/src/Components/Form/TextArea.css
@@ -0,0 +1,19 @@
+.input {
+  composes: input from '~Components/Form/Input.css';
+
+  flex-grow: 1;
+  min-height: 200px;
+  resize: vertical;
+}
+
+.readOnly {
+  background-color: #eee;
+}
+
+.hasError {
+  composes: hasError from '~Components/Form/Input.css';
+}
+
+.hasWarning {
+  composes: hasWarning from '~Components/Form/Input.css';
+}
diff --git a/frontend/src/Components/Form/TextArea.js b/frontend/src/Components/Form/TextArea.js
new file mode 100644
index 000000000..44fd3a249
--- /dev/null
+++ b/frontend/src/Components/Form/TextArea.js
@@ -0,0 +1,172 @@
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import styles from './TextArea.css';
+
+class TextArea extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this._input = null;
+    this._selectionStart = null;
+    this._selectionEnd = null;
+    this._selectionTimeout = null;
+    this._isMouseTarget = false;
+  }
+
+  componentDidMount() {
+    window.addEventListener('mouseup', this.onDocumentMouseUp);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('mouseup', this.onDocumentMouseUp);
+
+    if (this._selectionTimeout) {
+      this._selectionTimeout = clearTimeout(this._selectionTimeout);
+    }
+  }
+
+  //
+  // Control
+
+  setInputRef = (ref) => {
+    this._input = ref;
+  };
+
+  selectionChange() {
+    if (this._selectionTimeout) {
+      this._selectionTimeout = clearTimeout(this._selectionTimeout);
+    }
+
+    this._selectionTimeout = setTimeout(() => {
+      const selectionStart = this._input.selectionStart;
+      const selectionEnd = this._input.selectionEnd;
+
+      const selectionChanged = (
+        this._selectionStart !== selectionStart ||
+        this._selectionEnd !== selectionEnd
+      );
+
+      this._selectionStart = selectionStart;
+      this._selectionEnd = selectionEnd;
+
+      if (this.props.onSelectionChange && selectionChanged) {
+        this.props.onSelectionChange(selectionStart, selectionEnd);
+      }
+    }, 10);
+  }
+
+  //
+  // Listeners
+
+  onChange = (event) => {
+    const {
+      name,
+      onChange
+    } = this.props;
+
+    const payload = {
+      name,
+      value: event.target.value
+    };
+
+    onChange(payload);
+  };
+
+  onFocus = (event) => {
+    if (this.props.onFocus) {
+      this.props.onFocus(event);
+    }
+
+    this.selectionChange();
+  };
+
+  onKeyUp = () => {
+    this.selectionChange();
+  };
+
+  onMouseDown = () => {
+    this._isMouseTarget = true;
+  };
+
+  onMouseUp = () => {
+    this.selectionChange();
+  };
+
+  onDocumentMouseUp = () => {
+    if (this._isMouseTarget) {
+      this.selectionChange();
+    }
+
+    this._isMouseTarget = false;
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      className,
+      readOnly,
+      autoFocus,
+      placeholder,
+      name,
+      value,
+      hasError,
+      hasWarning,
+      onBlur
+    } = this.props;
+
+    return (
+      <textarea
+        ref={this.setInputRef}
+        readOnly={readOnly}
+        autoFocus={autoFocus}
+        placeholder={placeholder}
+        className={classNames(
+          className,
+          readOnly && styles.readOnly,
+          hasError && styles.hasError,
+          hasWarning && styles.hasWarning
+        )}
+        name={name}
+        value={value}
+        onChange={this.onChange}
+        onFocus={this.onFocus}
+        onBlur={onBlur}
+        onKeyUp={this.onKeyUp}
+        onMouseDown={this.onMouseDown}
+        onMouseUp={this.onMouseUp}
+      />
+    );
+  }
+}
+
+TextArea.propTypes = {
+  className: PropTypes.string.isRequired,
+  readOnly: PropTypes.bool,
+  autoFocus: PropTypes.bool,
+  placeholder: PropTypes.string,
+  name: PropTypes.string.isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.array]).isRequired,
+  hasError: PropTypes.bool,
+  hasWarning: PropTypes.bool,
+  onChange: PropTypes.func.isRequired,
+  onFocus: PropTypes.func,
+  onBlur: PropTypes.func,
+  onSelectionChange: PropTypes.func
+};
+
+TextArea.defaultProps = {
+  className: styles.input,
+  type: 'text',
+  readOnly: false,
+  autoFocus: false,
+  value: ''
+};
+
+export default TextArea;
diff --git a/frontend/src/Components/Form/TextTagInputConnector.js b/frontend/src/Components/Form/TextTagInputConnector.js
index cba307e26..bd2d0c9d0 100644
--- a/frontend/src/Components/Form/TextTagInputConnector.js
+++ b/frontend/src/Components/Form/TextTagInputConnector.js
@@ -46,13 +46,13 @@ class TextTagInputConnector extends Component {
     // to oddities with restrictions (as an example).
 
     const newValue = [...valueArray];
-    const newTags = split(tag.name);
+    const newTags = tag.name.startsWith('/') ? [tag.name] : split(tag.name);
 
     newTags.forEach((newTag) => {
       newValue.push(newTag.trim());
     });
 
-    onChange({ name, value: newValue.join(',') });
+    onChange({ name, value: newValue });
   };
 
   onTagDelete = ({ index }) => {
@@ -67,7 +67,7 @@ class TextTagInputConnector extends Component {
 
     onChange({
       name,
-      value: newValue.join(',')
+      value: newValue
     });
   };
 
diff --git a/frontend/src/Components/Link/ClipboardButton.js b/frontend/src/Components/Link/ClipboardButton.js
index 5930fb0d5..55843f05f 100644
--- a/frontend/src/Components/Link/ClipboardButton.js
+++ b/frontend/src/Components/Link/ClipboardButton.js
@@ -17,6 +17,7 @@ class ClipboardButton extends Component {
 
     this._id = getUniqueElememtId();
     this._successTimeout = null;
+    this._testResultTimeout = null;
 
     this.state = {
       showSuccess: false,
@@ -26,7 +27,8 @@ class ClipboardButton extends Component {
 
   componentDidMount() {
     this._clipboard = new Clipboard(`#${this._id}`, {
-      text: () => this.props.value
+      text: () => this.props.value,
+      container: document.getElementById(this._id)
     });
 
     this._clipboard.on('success', this.onSuccess);
@@ -47,6 +49,10 @@ class ClipboardButton extends Component {
     if (this._clipboard) {
       this._clipboard.destroy();
     }
+
+    if (this._testResultTimeout) {
+      clearTimeout(this._testResultTimeout);
+    }
   }
 
   //
@@ -80,6 +86,7 @@ class ClipboardButton extends Component {
   render() {
     const {
       value,
+      className,
       ...otherProps
     } = this.props;
 
@@ -95,7 +102,7 @@ class ClipboardButton extends Component {
     return (
       <FormInputButton
         id={this._id}
-        className={styles.button}
+        className={className}
         {...otherProps}
       >
         <span className={showStateIcon ? styles.showStateIcon : undefined}>
@@ -121,7 +128,12 @@ class ClipboardButton extends Component {
 }
 
 ClipboardButton.propTypes = {
+  className: PropTypes.string.isRequired,
   value: PropTypes.string.isRequired
 };
 
+ClipboardButton.defaultProps = {
+  className: styles.button
+};
+
 export default ClipboardButton;
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.js b/frontend/src/Components/Page/Sidebar/PageSidebar.js
index 1387b3c99..3074b7f42 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -104,6 +104,10 @@ const links = [
         title: translate('Quality'),
         to: '/settings/quality'
       },
+      {
+        title: translate('CustomFormats'),
+        to: '/settings/customformats'
+      },
       {
         title: translate('Indexers'),
         to: '/settings/indexers'
diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
index 800389284..65cf42204 100644
--- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
@@ -196,7 +196,7 @@ class TableOptionsModal extends Component {
                                       <TableOptionsColumnDragSource
                                         key={name}
                                         name={name}
-                                        label={label || columnLabel}
+                                        label={columnLabel || label}
                                         isVisible={isVisible}
                                         isModifiable={true}
                                         index={index}
@@ -214,7 +214,7 @@ class TableOptionsModal extends Component {
                                     <TableOptionsColumn
                                       key={name}
                                       name={name}
-                                      label={label || columnLabel}
+                                      label={columnLabel || label}
                                       isVisible={isVisible}
                                       index={index}
                                       isModifiable={false}
diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js
index 363102974..c25dcda8c 100644
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -54,6 +54,7 @@ import {
   faEye as fasEye,
   faFastBackward as fasFastBackward,
   faFastForward as fasFastForward,
+  faFileExport as fasFileExport,
   faFileImport as fasFileImport,
   faFileInvoice as farFileInvoice,
   faFilter as fasFilter,
@@ -143,6 +144,7 @@ export const EDIT = fasWrench;
 export const TRACK_FILE = farFileAudio;
 export const EXPAND = fasChevronCircleDown;
 export const EXPAND_INDETERMINATE = fasChevronCircleRight;
+export const EXPORT = fasFileExport;
 export const EXTERNAL_LINK = fasExternalLinkAlt;
 export const FATAL = fasTimesCircle;
 export const FILE = farFile;
diff --git a/frontend/src/Helpers/Props/inputTypes.js b/frontend/src/Helpers/Props/inputTypes.js
index 8710ff483..1b5c6c6fd 100644
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -22,6 +22,7 @@ export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
 export const TAG_SELECT = 'tagSelect';
 export const TEXT = 'text';
+export const TEXT_AREA = 'textArea';
 export const TEXT_TAG = 'textTag';
 export const UMASK = 'umask';
 
@@ -50,6 +51,7 @@ export const all = [
   TAG,
   TAG_SELECT,
   TEXT,
+  TEXT_AREA,
   TEXT_TAG,
   UMASK
 ];
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
index f9ee3c59e..0b9e6a97f 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
@@ -70,6 +70,15 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
+  {
+    name: 'customFormats',
+    label: React.createElement(Icon, {
+      name: icons.INTERACTIVE,
+      title: translate('CustomFormat')
+    }),
+    isSortable: true,
+    isVisible: true
+  },
   {
     name: 'rejections',
     label: React.createElement(Icon, {
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
index 599225f02..4c3b27de4 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
@@ -28,3 +28,7 @@
 
   color: var(--disabledColor);
 }
+
+.customFormatTooltip {
+  max-width: 250px;
+}
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
index 49d3fd0da..4018d900f 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import AlbumFormats from 'Album/AlbumFormats';
 import TrackQuality from 'Album/TrackQuality';
 import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -169,6 +170,7 @@ class InteractiveImportRow extends Component {
       quality,
       releaseGroup,
       size,
+      customFormats,
       rejections,
       isReprocessing,
       audioTags,
@@ -303,7 +305,26 @@ class InteractiveImportRow extends Component {
 
         <TableRowCell>
           {
-            rejections && rejections.length ?
+            customFormats?.length ?
+              <Popover
+                anchor={
+                  <Icon name={icons.INTERACTIVE} />
+                }
+                title="Formats"
+                body={
+                  <div className={styles.customFormatTooltip}>
+                    <AlbumFormats formats={customFormats} />
+                  </div>
+                }
+                position={tooltipPositions.LEFT}
+              /> :
+              null
+          }
+        </TableRowCell>
+
+        <TableRowCell>
+          {
+            rejections.length ?
               <Popover
                 anchor={
                   <Icon
@@ -391,6 +412,7 @@ InteractiveImportRow.propTypes = {
   releaseGroup: PropTypes.string,
   quality: PropTypes.object,
   size: PropTypes.number.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
   audioTags: PropTypes.object.isRequired,
   additionalFile: PropTypes.bool.isRequired,
diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.js b/frontend/src/InteractiveSearch/InteractiveSearch.js
index c91bdf6f8..3aa8e56c0 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearch.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearch.js
@@ -56,10 +56,10 @@ const columns = [
     isVisible: true
   },
   {
-    name: 'preferredWordScore',
+    name: 'customFormatScore',
     label: React.createElement(Icon, {
       name: icons.SCORE,
-      title: translate('PreferredWordScore')
+      title: translate('CustomFormatScore')
     }),
     isSortable: true,
     isVisible: true
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.css b/frontend/src/InteractiveSearch/InteractiveSearchRow.css
index 3ec30e184..c1079c792 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.css
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.css
@@ -22,7 +22,7 @@
   text-align: center;
 }
 
-.preferredWordScore {
+.customFormatScore {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 55px;
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.js b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
index 5bdd7c02b..19130f54e 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
+import AlbumFormats from 'Album/AlbumFormats';
 import TrackQuality from 'Album/TrackQuality';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
@@ -9,10 +10,12 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
+import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
 import formatBytes from 'Utilities/Number/formatBytes';
+import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
 import translate from 'Utilities/String/translate';
 import Peers from './Peers';
 import styles from './InteractiveSearchRow.css';
@@ -112,7 +115,8 @@ class InteractiveSearchRow extends Component {
       seeders,
       leechers,
       quality,
-      preferredWordScore,
+      customFormatScore,
+      customFormats,
       rejections,
       downloadAllowed,
       isGrabbing,
@@ -165,9 +169,14 @@ class InteractiveSearchRow extends Component {
           <TrackQuality quality={quality} />
         </TableRowCell>
 
-        <TableRowCell className={styles.preferredWordScore}>
-          {preferredWordScore > 0 && `+${preferredWordScore}`}
-          {preferredWordScore < 0 && preferredWordScore}
+        <TableRowCell className={styles.customFormatScore}>
+          <Tooltip
+            anchor={
+              formatPreferredWordScore(customFormatScore, customFormats.length)
+            }
+            tooltip={<AlbumFormats formats={customFormats} />}
+            position={tooltipPositions.BOTTOM}
+          />
         </TableRowCell>
 
         <TableRowCell className={styles.rejected}>
@@ -240,7 +249,8 @@ InteractiveSearchRow.propTypes = {
   seeders: PropTypes.number,
   leechers: PropTypes.number,
   quality: PropTypes.object.isRequired,
-  preferredWordScore: PropTypes.number.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
   rejections: PropTypes.arrayOf(PropTypes.string).isRequired,
   downloadAllowed: PropTypes.bool.isRequired,
   isGrabbing: PropTypes.bool.isRequired,
diff --git a/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js b/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js
new file mode 100644
index 000000000..b114b8a5e
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js
@@ -0,0 +1,32 @@
+import React, { Component } from 'react';
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import CustomFormatsConnector from './CustomFormats/CustomFormatsConnector';
+
+class CustomFormatSettingsConnector extends Component {
+
+  //
+  // Render
+
+  render() {
+    return (
+      <PageContent title="Custom Format Settings">
+        <SettingsToolbarConnector
+          showSave={false}
+        />
+
+        <PageContentBody>
+          <DndProvider backend={HTML5Backend}>
+            <CustomFormatsConnector />
+          </DndProvider>
+        </PageContentBody>
+      </PageContent>
+    );
+  }
+}
+
+export default CustomFormatSettingsConnector;
+
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css
new file mode 100644
index 000000000..0ec29c546
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css
@@ -0,0 +1,49 @@
+.customFormat {
+  composes: card from '~Components/Card.css';
+
+  width: 300px;
+}
+
+.nameContainer {
+  display: flex;
+  justify-content: space-between;
+}
+
+.name {
+  @add-mixin truncate;
+
+  margin-bottom: 20px;
+  font-weight: 300;
+  font-size: 24px;
+}
+
+.buttons {
+  flex: 0 0 auto;
+}
+
+.cloneButton {
+  composes: button from '~Components/Link/IconButton.css';
+
+  height: 36px;
+}
+
+.formats {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 5px;
+  pointer-events: all;
+}
+
+.tooltipLabel {
+  composes: label from '~Components/Label.css';
+
+  margin: 0;
+  border: none;
+}
+
+.label {
+  @add-mixin truncate;
+  composes: label from '~Components/Label.css';
+
+  max-width: 100%;
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
new file mode 100644
index 000000000..e32a58cc1
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
@@ -0,0 +1,174 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Card from 'Components/Card';
+import Label from 'Components/Label';
+import IconButton from 'Components/Link/IconButton';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
+import { icons, kinds } from 'Helpers/Props';
+import EditCustomFormatModalConnector from './EditCustomFormatModalConnector';
+import ExportCustomFormatModal from './ExportCustomFormatModal';
+import styles from './CustomFormat.css';
+
+class CustomFormat extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isEditCustomFormatModalOpen: false,
+      isExportCustomFormatModalOpen: false,
+      isDeleteCustomFormatModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onEditCustomFormatPress = () => {
+    this.setState({ isEditCustomFormatModalOpen: true });
+  };
+
+  onEditCustomFormatModalClose = () => {
+    this.setState({ isEditCustomFormatModalOpen: false });
+  };
+
+  onExportCustomFormatPress = () => {
+    this.setState({ isExportCustomFormatModalOpen: true });
+  };
+
+  onExportCustomFormatModalClose = () => {
+    this.setState({ isExportCustomFormatModalOpen: false });
+  };
+
+  onDeleteCustomFormatPress = () => {
+    this.setState({
+      isEditCustomFormatModalOpen: false,
+      isDeleteCustomFormatModalOpen: true
+    });
+  };
+
+  onDeleteCustomFormatModalClose = () => {
+    this.setState({ isDeleteCustomFormatModalOpen: false });
+  };
+
+  onConfirmDeleteCustomFormat = () => {
+    this.props.onConfirmDeleteCustomFormat(this.props.id);
+  };
+
+  onCloneCustomFormatPress = () => {
+    const {
+      id,
+      onCloneCustomFormatPress
+    } = this.props;
+
+    onCloneCustomFormatPress(id);
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      id,
+      name,
+      specifications,
+      isDeleting
+    } = this.props;
+
+    return (
+      <Card
+        className={styles.customFormat}
+        overlayContent={true}
+        onPress={this.onEditCustomFormatPress}
+      >
+        <div className={styles.nameContainer}>
+          <div className={styles.name}>
+            {name}
+          </div>
+
+          <div className={styles.buttons}>
+            <IconButton
+              className={styles.cloneButton}
+              title="Clone Custom Format"
+              name={icons.CLONE}
+              onPress={this.onCloneCustomFormatPress}
+            />
+
+            <IconButton
+              className={styles.cloneButton}
+              title="Export Custom Format"
+              name={icons.EXPORT}
+              onPress={this.onExportCustomFormatPress}
+            />
+          </div>
+        </div>
+
+        <div>
+          {
+            specifications.map((item, index) => {
+              if (!item) {
+                return null;
+              }
+
+              let kind = kinds.DEFAULT;
+              if (item.required) {
+                kind = kinds.SUCCESS;
+              }
+              if (item.negate) {
+                kind = kinds.DANGER;
+              }
+
+              return (
+                <Label
+                  className={styles.label}
+                  key={index}
+                  kind={kind}
+                >
+                  {item.name}
+                </Label>
+              );
+            })
+          }
+        </div>
+
+        <EditCustomFormatModalConnector
+          id={id}
+          isOpen={this.state.isEditCustomFormatModalOpen}
+          onModalClose={this.onEditCustomFormatModalClose}
+          onDeleteCustomFormatPress={this.onDeleteCustomFormatPress}
+        />
+
+        <ExportCustomFormatModal
+          id={id}
+          isOpen={this.state.isExportCustomFormatModalOpen}
+          onModalClose={this.onExportCustomFormatModalClose}
+        />
+
+        <ConfirmModal
+          isOpen={this.state.isDeleteCustomFormatModalOpen}
+          kind={kinds.DANGER}
+          title="Delete Custom Format"
+          message={`Are you sure you want to delete the custom format '${name}'?`}
+          confirmLabel="Delete"
+          isSpinning={isDeleting}
+          onConfirm={this.onConfirmDeleteCustomFormat}
+          onCancel={this.onDeleteCustomFormatModalClose}
+        />
+      </Card>
+    );
+  }
+}
+
+CustomFormat.propTypes = {
+  id: PropTypes.number.isRequired,
+  name: PropTypes.string.isRequired,
+  specifications: PropTypes.arrayOf(PropTypes.object).isRequired,
+  isDeleting: PropTypes.bool.isRequired,
+  onConfirmDeleteCustomFormat: PropTypes.func.isRequired,
+  onCloneCustomFormatPress: PropTypes.func.isRequired
+};
+
+export default CustomFormat;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.css b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.css
new file mode 100644
index 000000000..3e5929be6
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.css
@@ -0,0 +1,21 @@
+.customFormats {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.addCustomFormat {
+  composes: customFormat from '~./CustomFormat.css';
+
+  background-color: var(--cardAlternateBackgroundColor);
+  color: var(--gray);
+  text-align: center;
+  font-size: 45px;
+}
+
+.center {
+  display: inline-block;
+  padding: 5px 20px 0;
+  border: 1px solid var(--borderColor);
+  border-radius: 4px;
+  background-color: var(--cardCenterBackgroundColor);
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js
new file mode 100644
index 000000000..990f51f2c
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js
@@ -0,0 +1,115 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Card from 'Components/Card';
+import FieldSet from 'Components/FieldSet';
+import Icon from 'Components/Icon';
+import PageSectionContent from 'Components/Page/PageSectionContent';
+import { icons } from 'Helpers/Props';
+import CustomFormat from './CustomFormat';
+import EditCustomFormatModalConnector from './EditCustomFormatModalConnector';
+import styles from './CustomFormats.css';
+
+class CustomFormats extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isCustomFormatModalOpen: false,
+      tagsFromId: undefined
+    };
+  }
+
+  //
+  // Listeners
+
+  onCloneCustomFormatPress = (id) => {
+    this.props.onCloneCustomFormatPress(id);
+    this.setState({
+      isCustomFormatModalOpen: true,
+      tagsFromId: id
+    });
+  };
+
+  onEditCustomFormatPress = () => {
+    this.setState({ isCustomFormatModalOpen: true });
+  };
+
+  onModalClose = () => {
+    this.setState({
+      isCustomFormatModalOpen: false,
+      tagsFromId: undefined
+    });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      items,
+      isDeleting,
+      onConfirmDeleteCustomFormat,
+      onCloneCustomFormatPress,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <FieldSet legend="Custom Formats">
+        <PageSectionContent
+          errorMessage="Unable to load custom formats"
+          {...otherProps}c={true}
+        >
+          <div className={styles.customFormats}>
+            {
+              items.map((item) => {
+                return (
+                  <CustomFormat
+                    key={item.id}
+                    {...item}
+                    isDeleting={isDeleting}
+                    onConfirmDeleteCustomFormat={onConfirmDeleteCustomFormat}
+                    onCloneCustomFormatPress={this.onCloneCustomFormatPress}
+                  />
+                );
+              })
+            }
+
+            <Card
+              className={styles.addCustomFormat}
+              onPress={this.onEditCustomFormatPress}
+            >
+              <div className={styles.center}>
+                <Icon
+                  name={icons.ADD}
+                  size={45}
+                />
+              </div>
+            </Card>
+          </div>
+
+          <EditCustomFormatModalConnector
+            isOpen={this.state.isCustomFormatModalOpen}
+            tagsFromId={this.state.tagsFromId}
+            onModalClose={this.onModalClose}
+          />
+
+        </PageSectionContent>
+      </FieldSet>
+    );
+  }
+}
+
+CustomFormats.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  isDeleting: PropTypes.bool.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onConfirmDeleteCustomFormat: PropTypes.func.isRequired,
+  onCloneCustomFormatPress: PropTypes.func.isRequired
+};
+
+export default CustomFormats;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js
new file mode 100644
index 000000000..8e828620b
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js
@@ -0,0 +1,63 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { cloneCustomFormat, deleteCustomFormat, fetchCustomFormats } from 'Store/Actions/settingsActions';
+import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
+import sortByName from 'Utilities/Array/sortByName';
+import CustomFormats from './CustomFormats';
+
+function createMapStateToProps() {
+  return createSelector(
+    createSortedSectionSelector('settings.customFormats', sortByName),
+    (customFormats) => customFormats
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchFetchCustomFormats: fetchCustomFormats,
+  dispatchDeleteCustomFormat: deleteCustomFormat,
+  dispatchCloneCustomFormat: cloneCustomFormat
+};
+
+class CustomFormatsConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    this.props.dispatchFetchCustomFormats();
+  }
+
+  //
+  // Listeners
+
+  onConfirmDeleteCustomFormat = (id) => {
+    this.props.dispatchDeleteCustomFormat({ id });
+  };
+
+  onCloneCustomFormatPress = (id) => {
+    this.props.dispatchCloneCustomFormat({ id });
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <CustomFormats
+        onConfirmDeleteCustomFormat={this.onConfirmDeleteCustomFormat}
+        onCloneCustomFormatPress={this.onCloneCustomFormatPress}
+        {...this.props}
+      />
+    );
+  }
+}
+
+CustomFormatsConnector.propTypes = {
+  dispatchFetchCustomFormats: PropTypes.func.isRequired,
+  dispatchDeleteCustomFormat: PropTypes.func.isRequired,
+  dispatchCloneCustomFormat: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(CustomFormatsConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js
new file mode 100644
index 000000000..cf15d32c6
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js
@@ -0,0 +1,61 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import EditCustomFormatModalContentConnector from './EditCustomFormatModalContentConnector';
+
+class EditCustomFormatModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      height: 'auto'
+    };
+  }
+
+  //
+  // Listeners
+
+  onContentHeightChange = (height) => {
+    if (this.state.height === 'auto' || height > this.state.height) {
+      this.setState({ height });
+    }
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      onModalClose,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <Modal
+        style={{ height: `${this.state.height}px` }}
+        isOpen={isOpen}
+        size={sizes.LARGE}
+        onModalClose={onModalClose}
+      >
+        <EditCustomFormatModalContentConnector
+          {...otherProps}
+          onContentHeightChange={this.onContentHeightChange}
+          onModalClose={onModalClose}
+        />
+      </Modal>
+    );
+  }
+}
+
+EditCustomFormatModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default EditCustomFormatModal;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalConnector.js
new file mode 100644
index 000000000..52b2f09f6
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalConnector.js
@@ -0,0 +1,43 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { clearPendingChanges } from 'Store/Actions/baseActions';
+import EditCustomFormatModal from './EditCustomFormatModal';
+
+function mapStateToProps() {
+  return {};
+}
+
+const mapDispatchToProps = {
+  clearPendingChanges
+};
+
+class EditCustomFormatModalConnector extends Component {
+
+  //
+  // Listeners
+
+  onModalClose = () => {
+    this.props.clearPendingChanges({ section: 'settings.customFormats' });
+    this.props.onModalClose();
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EditCustomFormatModal
+        {...this.props}
+        onModalClose={this.onModalClose}
+      />
+    );
+  }
+}
+
+EditCustomFormatModalConnector.propTypes = {
+  onModalClose: PropTypes.func.isRequired,
+  clearPendingChanges: PropTypes.func.isRequired
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(EditCustomFormatModalConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
new file mode 100644
index 000000000..b7d3da255
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
@@ -0,0 +1,27 @@
+.deleteButton {
+  composes: button from '~Components/Link/Button.css';
+
+  margin-right: auto;
+}
+
+.rightButtons {
+  justify-content: flex-end;
+  margin-right: auto;
+}
+
+.addSpecification {
+  composes: customFormat from '~./CustomFormat.css';
+
+  background-color: var(--cardAlternateBackgroundColor);
+  color: var(--gray);
+  text-align: center;
+  font-size: 45px;
+}
+
+.center {
+  display: inline-block;
+  padding: 5px 20px 0;
+  border: 1px solid var(--borderColor);
+  border-radius: 4px;
+  background-color: var(--cardCenterBackgroundColor);
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
new file mode 100644
index 000000000..8e16ab54c
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
@@ -0,0 +1,256 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Card from 'Components/Card';
+import FieldSet from 'Components/FieldSet';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Icon from 'Components/Icon';
+import Button from 'Components/Link/Button';
+import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+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 { icons, inputTypes, kinds } from 'Helpers/Props';
+import ImportCustomFormatModal from './ImportCustomFormatModal';
+import AddSpecificationModal from './Specifications/AddSpecificationModal';
+import EditSpecificationModalConnector from './Specifications/EditSpecificationModalConnector';
+import Specification from './Specifications/Specification';
+import styles from './EditCustomFormatModalContent.css';
+
+class EditCustomFormatModalContent extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isAddSpecificationModalOpen: false,
+      isEditSpecificationModalOpen: false,
+      isImportCustomFormatModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onAddSpecificationPress = () => {
+    this.setState({ isAddSpecificationModalOpen: true });
+  };
+
+  onAddSpecificationModalClose = ({ specificationSelected = false } = {}) => {
+    this.setState({
+      isAddSpecificationModalOpen: false,
+      isEditSpecificationModalOpen: specificationSelected
+    });
+  };
+
+  onEditSpecificationModalClose = () => {
+    this.setState({ isEditSpecificationModalOpen: false });
+  };
+
+  onImportPress = () => {
+    this.setState({ isImportCustomFormatModalOpen: true });
+  };
+
+  onImportCustomFormatModalClose = () => {
+    this.setState({ isImportCustomFormatModalOpen: false });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isFetching,
+      error,
+      isSaving,
+      saveError,
+      item,
+      specificationsPopulated,
+      specifications,
+      onInputChange,
+      onSavePress,
+      onModalClose,
+      onDeleteCustomFormatPress,
+      onCloneSpecificationPress,
+      onConfirmDeleteSpecification,
+      ...otherProps
+    } = this.props;
+
+    const {
+      isAddSpecificationModalOpen,
+      isEditSpecificationModalOpen,
+      isImportCustomFormatModalOpen
+    } = this.state;
+
+    const {
+      id,
+      name,
+      includeCustomFormatWhenRenaming
+    } = item;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+
+        <ModalHeader>
+          {id ? 'Edit Custom Format' : 'Add Custom Format'}
+        </ModalHeader>
+
+        <ModalBody>
+          <div>
+            {
+              isFetching &&
+                <LoadingIndicator />
+            }
+
+            {
+              !isFetching && !!error &&
+                <div>
+                  {'Unable to add a new custom format, please try again.'}
+                </div>
+            }
+
+            {
+              !isFetching && !error && specificationsPopulated &&
+                <div>
+                  <Form
+                    {...otherProps}
+                  >
+                    <FormGroup>
+                      <FormLabel>
+                        Name
+                      </FormLabel>
+
+                      <FormInputGroup
+                        type={inputTypes.TEXT}
+                        name="name"
+                        {...name}
+                        onChange={onInputChange}
+                      />
+                    </FormGroup>
+
+                    <FormGroup>
+                      <FormLabel>{'Include Custom Format when Renaming'}</FormLabel>
+
+                      <FormInputGroup
+                        type={inputTypes.CHECK}
+                        name="includeCustomFormatWhenRenaming"
+                        helpText={'Include in {Custom Formats} renaming format'}
+                        {...includeCustomFormatWhenRenaming}
+                        onChange={onInputChange}
+                      />
+                    </FormGroup>
+                  </Form>
+
+                  <FieldSet legend={'Conditions'}>
+                    <div className={styles.customFormats}>
+                      {
+                        specifications.map((tag) => {
+                          return (
+                            <Specification
+                              key={tag.id}
+                              {...tag}
+                              onCloneSpecificationPress={onCloneSpecificationPress}
+                              onConfirmDeleteSpecification={onConfirmDeleteSpecification}
+                            />
+                          );
+                        })
+                      }
+
+                      <Card
+                        className={styles.addSpecification}
+                        onPress={this.onAddSpecificationPress}
+                      >
+                        <div className={styles.center}>
+                          <Icon
+                            name={icons.ADD}
+                            size={45}
+                          />
+                        </div>
+                      </Card>
+                    </div>
+                  </FieldSet>
+
+                  <AddSpecificationModal
+                    isOpen={isAddSpecificationModalOpen}
+                    onModalClose={this.onAddSpecificationModalClose}
+                  />
+
+                  <EditSpecificationModalConnector
+                    isOpen={isEditSpecificationModalOpen}
+                    onModalClose={this.onEditSpecificationModalClose}
+                  />
+
+                  <ImportCustomFormatModal
+                    isOpen={isImportCustomFormatModalOpen}
+                    onModalClose={this.onImportCustomFormatModalClose}
+                  />
+
+                </div>
+            }
+          </div>
+        </ModalBody>
+        <ModalFooter>
+          <div className={styles.rightButtons}>
+            {
+              id &&
+                <Button
+                  className={styles.deleteButton}
+                  kind={kinds.DANGER}
+                  onPress={onDeleteCustomFormatPress}
+                >
+                  Delete
+                </Button>
+            }
+
+            <Button
+              className={styles.deleteButton}
+              onPress={this.onImportPress}
+            >
+              Import
+            </Button>
+          </div>
+
+          <Button
+            onPress={onModalClose}
+          >
+            Cancel
+          </Button>
+
+          <SpinnerErrorButton
+            isSpinning={isSaving}
+            error={saveError}
+            onPress={onSavePress}
+          >
+            Save
+          </SpinnerErrorButton>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+EditCustomFormatModalContent.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  isSaving: PropTypes.bool.isRequired,
+  saveError: PropTypes.object,
+  item: PropTypes.object.isRequired,
+  specificationsPopulated: PropTypes.bool.isRequired,
+  specifications: PropTypes.arrayOf(PropTypes.object),
+  onInputChange: PropTypes.func.isRequired,
+  onSavePress: PropTypes.func.isRequired,
+  onContentHeightChange: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired,
+  onDeleteCustomFormatPress: PropTypes.func,
+  onCloneSpecificationPress: PropTypes.func.isRequired,
+  onConfirmDeleteSpecification: PropTypes.func.isRequired
+};
+
+export default EditCustomFormatModalContent;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js
new file mode 100644
index 000000000..5d22126aa
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js
@@ -0,0 +1,102 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { cloneCustomFormatSpecification, deleteCustomFormatSpecification, fetchCustomFormatSpecifications, saveCustomFormat, setCustomFormatValue } from 'Store/Actions/settingsActions';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
+import EditCustomFormatModalContent from './EditCustomFormatModalContent';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.advancedSettings,
+    createProviderSettingsSelector('customFormats'),
+    (state) => state.settings.customFormatSpecifications,
+    (advancedSettings, customFormat, specifications) => {
+      return {
+        advancedSettings,
+        ...customFormat,
+        specificationsPopulated: specifications.isPopulated,
+        specifications: specifications.items
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  setCustomFormatValue,
+  saveCustomFormat,
+  fetchCustomFormatSpecifications,
+  cloneCustomFormatSpecification,
+  deleteCustomFormatSpecification
+};
+
+class EditCustomFormatModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      id,
+      tagsFromId
+    } = this.props;
+    this.props.fetchCustomFormatSpecifications({ id: tagsFromId || id });
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
+      this.props.onModalClose();
+    }
+  }
+
+  //
+  // Listeners
+
+  onInputChange = ({ name, value }) => {
+    this.props.setCustomFormatValue({ name, value });
+  };
+
+  onSavePress = () => {
+    this.props.saveCustomFormat({ id: this.props.id });
+  };
+
+  onCloneSpecificationPress = (id) => {
+    this.props.cloneCustomFormatSpecification({ id });
+  };
+
+  onConfirmDeleteSpecification = (id) => {
+    this.props.deleteCustomFormatSpecification({ id });
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EditCustomFormatModalContent
+        {...this.props}
+        onSavePress={this.onSavePress}
+        onInputChange={this.onInputChange}
+        onCloneSpecificationPress={this.onCloneSpecificationPress}
+        onConfirmDeleteSpecification={this.onConfirmDeleteSpecification}
+      />
+    );
+  }
+}
+
+EditCustomFormatModalContentConnector.propTypes = {
+  id: PropTypes.number,
+  tagsFromId: PropTypes.number,
+  isFetching: PropTypes.bool.isRequired,
+  isSaving: PropTypes.bool.isRequired,
+  saveError: PropTypes.object,
+  item: PropTypes.object.isRequired,
+  setCustomFormatValue: PropTypes.func.isRequired,
+  saveCustomFormat: PropTypes.func.isRequired,
+  fetchCustomFormatSpecifications: PropTypes.func.isRequired,
+  cloneCustomFormatSpecification: PropTypes.func.isRequired,
+  deleteCustomFormatSpecification: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(EditCustomFormatModalContentConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModal.js
new file mode 100644
index 000000000..17105f67f
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModal.js
@@ -0,0 +1,61 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import ExportCustomFormatModalContentConnector from './ExportCustomFormatModalContentConnector';
+
+class ExportCustomFormatModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      height: 'auto'
+    };
+  }
+
+  //
+  // Listeners
+
+  onContentHeightChange = (height) => {
+    if (this.state.height === 'auto' || height > this.state.height) {
+      this.setState({ height });
+    }
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      onModalClose,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <Modal
+        style={{ height: `${this.state.height}px` }}
+        isOpen={isOpen}
+        size={sizes.LARGE}
+        onModalClose={onModalClose}
+      >
+        <ExportCustomFormatModalContentConnector
+          {...otherProps}
+          onContentHeightChange={this.onContentHeightChange}
+          onModalClose={onModalClose}
+        />
+      </Modal>
+    );
+  }
+}
+
+ExportCustomFormatModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default ExportCustomFormatModal;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.css b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.css
new file mode 100644
index 000000000..d7983f681
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.css
@@ -0,0 +1,5 @@
+.button {
+  composes: button from '~Components/Link/Button.css';
+
+  position: relative;
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js
new file mode 100644
index 000000000..96e93d3b6
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js
@@ -0,0 +1,84 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from 'Components/Link/Button';
+import ClipboardButton from 'Components/Link/ClipboardButton';
+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 { kinds } from 'Helpers/Props';
+import styles from './ExportCustomFormatModalContent.css';
+
+class ExportCustomFormatModalContent extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isFetching,
+      error,
+      json,
+      specificationsPopulated,
+      onModalClose
+    } = this.props;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+
+        <ModalHeader>
+          Export Custom Format
+        </ModalHeader>
+
+        <ModalBody>
+          <div>
+            {
+              isFetching &&
+                <LoadingIndicator />
+            }
+
+            {
+              !isFetching && !!error &&
+                <div>
+                  Unable to load custom formats
+                </div>
+            }
+
+            {
+              !isFetching && !error && specificationsPopulated &&
+                <div>
+                  <pre>
+                    {json}
+                  </pre>
+                </div>
+            }
+          </div>
+        </ModalBody>
+        <ModalFooter>
+          <ClipboardButton
+            className={styles.button}
+            value={json}
+            title="Copy to clipboard"
+            kind={kinds.DEFAULT}
+          />
+          <Button
+            onPress={onModalClose}
+          >
+            Close
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+ExportCustomFormatModalContent.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  json: PropTypes.string.isRequired,
+  specificationsPopulated: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default ExportCustomFormatModalContent;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContentConnector.js
new file mode 100644
index 000000000..521d83d41
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContentConnector.js
@@ -0,0 +1,83 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchCustomFormatSpecifications } from 'Store/Actions/settingsActions';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
+import ExportCustomFormatModalContent from './ExportCustomFormatModalContent';
+
+const omittedProperties = ['id', 'implementationName', 'infoLink'];
+
+function replacer(key, value) {
+  if (omittedProperties.includes(key)) {
+    return undefined;
+  }
+
+  // provider fields
+  if (key === 'fields') {
+    return value.reduce((acc, cur) => {
+      acc[cur.name] = cur.value;
+      return acc;
+    }, {});
+  }
+
+  // regular setting values
+  if (value.hasOwnProperty('value')) {
+    return value.value;
+  }
+
+  return value;
+}
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.advancedSettings,
+    createProviderSettingsSelector('customFormats'),
+    (state) => state.settings.customFormatSpecifications,
+    (advancedSettings, customFormat, specifications) => {
+      const json = customFormat.item ? JSON.stringify(customFormat.item, replacer, 2) : '';
+      return {
+        advancedSettings,
+        ...customFormat,
+        json,
+        specificationsPopulated: specifications.isPopulated,
+        specifications: specifications.items
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  fetchCustomFormatSpecifications
+};
+
+class ExportCustomFormatModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      id
+    } = this.props;
+    this.props.fetchCustomFormatSpecifications({ id });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <ExportCustomFormatModalContent
+        {...this.props}
+      />
+    );
+  }
+}
+
+ExportCustomFormatModalContentConnector.propTypes = {
+  id: PropTypes.number,
+  fetchCustomFormatSpecifications: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(ExportCustomFormatModalContentConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModal.js
new file mode 100644
index 000000000..4cd8cb1d4
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModal.js
@@ -0,0 +1,61 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import ImportCustomFormatModalContentConnector from './ImportCustomFormatModalContentConnector';
+
+class ImportCustomFormatModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      height: 'auto'
+    };
+  }
+
+  //
+  // Listeners
+
+  onContentHeightChange = (height) => {
+    if (this.state.height === 'auto' || height > this.state.height) {
+      this.setState({ height });
+    }
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      onModalClose,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <Modal
+        style={{ height: `${this.state.height}px` }}
+        isOpen={isOpen}
+        size={sizes.LARGE}
+        onModalClose={onModalClose}
+      >
+        <ImportCustomFormatModalContentConnector
+          {...otherProps}
+          onContentHeightChange={this.onContentHeightChange}
+          onModalClose={onModalClose}
+        />
+      </Modal>
+    );
+  }
+}
+
+ImportCustomFormatModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default ImportCustomFormatModal;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.css b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.css
new file mode 100644
index 000000000..028df2455
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.css
@@ -0,0 +1,5 @@
+.input {
+  composes: input from '~Components/Form/TextArea.css';
+
+  font-family: $monoSpaceFontFamily;
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js
new file mode 100644
index 000000000..5fc796ea6
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js
@@ -0,0 +1,151 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+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, sizes } from 'Helpers/Props';
+import styles from './ImportCustomFormatModalContent.css';
+
+class ImportCustomFormatModalContent extends Component {
+
+  //
+  // Lifecycle
+  constructor(props, context) {
+    super(props, context);
+
+    this._importTimeout = null;
+
+    this.state = {
+      json: '',
+      isSpinning: false,
+      parseError: null
+    };
+  }
+
+  componentWillUnmount() {
+    if (this._importTimeout) {
+      clearTimeout(this._importTimeout);
+    }
+  }
+
+  //
+  // Control
+
+  onChange = (event) => {
+    this.setState({ json: event.value });
+  };
+
+  onImportPress = () => {
+    this.setState({ isSpinning: true });
+    // this is a bodge as we need to register a isSpinning: true to get the spinner button to update
+    this._importTimeout = setTimeout(this.doImport, 250);
+  };
+
+  doImport = () => {
+    const parseError = this.props.onImportPress(this.state.json);
+    this.setState({
+      parseError,
+      isSpinning: false
+    });
+
+    if (!parseError) {
+      this.props.onModalClose();
+    }
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isFetching,
+      error,
+      specificationsPopulated,
+      onModalClose
+    } = this.props;
+
+    const {
+      json,
+      isSpinning,
+      parseError
+    } = this.state;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+
+        <ModalHeader>
+          Import Custom Format
+        </ModalHeader>
+
+        <ModalBody>
+          <div>
+            {
+              isFetching &&
+                <LoadingIndicator />
+            }
+
+            {
+              !isFetching && !!error &&
+                <div>
+                  Unable to load custom formats
+                </div>
+            }
+
+            {
+              !isFetching && !error && specificationsPopulated &&
+                <Form>
+                  <FormGroup size={sizes.MEDIUM}>
+                    <FormLabel>
+                      Custom Format JSON
+                    </FormLabel>
+                    <FormInputGroup
+                      key={0}
+                      inputClassName={styles.input}
+                      type={inputTypes.TEXT_AREA}
+                      name="customFormatJson"
+                      value={json}
+                      onChange={this.onChange}
+                      placeholder={'{\n  "name": "Custom Format"\n}'}
+                      errors={parseError ? [parseError] : []}
+                    />
+                  </FormGroup>
+                </Form>
+            }
+          </div>
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            onPress={onModalClose}
+          >
+            Cancel
+          </Button>
+          <SpinnerErrorButton
+            onPress={this.onImportPress}
+            isSpinning={isSpinning}
+            error={parseError}
+          >
+            Import
+          </SpinnerErrorButton>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+ImportCustomFormatModalContent.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  specificationsPopulated: PropTypes.bool.isRequired,
+  onImportPress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default ImportCustomFormatModalContent;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js
new file mode 100644
index 000000000..3a92bd136
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js
@@ -0,0 +1,145 @@
+import _ from 'lodash';
+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 { clearCustomFormatSpecificationPending, deleteAllCustomFormatSpecification, fetchCustomFormatSpecificationSchema, saveCustomFormatSpecification, selectCustomFormatSpecificationSchema, setCustomFormatSpecificationFieldValue, setCustomFormatSpecificationValue, setCustomFormatValue } from 'Store/Actions/settingsActions';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
+import ImportCustomFormatModalContent from './ImportCustomFormatModalContent';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.advancedSettings,
+    createProviderSettingsSelector('customFormats'),
+    (state) => state.settings.customFormatSpecifications,
+    (advancedSettings, customFormat, specifications) => {
+      return {
+        advancedSettings,
+        ...customFormat,
+        specificationsPopulated: specifications.isPopulated,
+        specificationSchema: specifications.schema
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  deleteAllCustomFormatSpecification,
+  clearCustomFormatSpecificationPending,
+  clearPendingChanges,
+  saveCustomFormatSpecification,
+  selectCustomFormatSpecificationSchema,
+  setCustomFormatSpecificationFieldValue,
+  setCustomFormatSpecificationValue,
+  setCustomFormatValue,
+  fetchCustomFormatSpecificationSchema
+};
+
+class ImportCustomFormatModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    this.props.fetchCustomFormatSpecificationSchema();
+  }
+
+  //
+  // Listeners
+
+  clearPending = () => {
+    this.props.clearPendingChanges({ section: 'settings.customFormats' });
+    this.props.clearCustomFormatSpecificationPending();
+    this.props.deleteAllCustomFormatSpecification();
+  };
+
+  onImportPress = (payload) => {
+
+    this.clearPending();
+
+    try {
+      const cf = JSON.parse(payload);
+      this.parseCf(cf);
+    } catch (err) {
+      this.clearPending();
+      return {
+        message: err.message,
+        detailedMessage: err.stack
+      };
+    }
+
+    return null;
+  };
+
+  parseCf = (cf) => {
+    for (const [key, value] of Object.entries(cf)) {
+      if (key === 'specifications') {
+        for (const spec of value) {
+          this.parseSpecification(spec);
+        }
+      } else if (key !== 'id') {
+        this.props.setCustomFormatValue({ name: key, value });
+      }
+    }
+  };
+
+  parseSpecification = (spec) => {
+    const selectedImplementation = _.find(this.props.specificationSchema, { implementation: spec.implementation });
+
+    if (!selectedImplementation) {
+      throw new Error(`Unknown Custom Format condition '${spec.implementation}'`);
+    }
+
+    this.props.selectCustomFormatSpecificationSchema({ implementation: spec.implementation });
+
+    for (const [key, value] of Object.entries(spec)) {
+      if (key === 'fields') {
+        this.parseFields(value, selectedImplementation);
+      } else if (key !== 'id') {
+        this.props.setCustomFormatSpecificationValue({ name: key, value });
+      }
+    }
+
+    this.props.saveCustomFormatSpecification();
+  };
+
+  parseFields = (fields, schema) => {
+    for (const [key, value] of Object.entries(fields)) {
+      const field = _.find(schema.fields, { name: key });
+      if (!field) {
+        throw new Error(`Unknown option '${key}' for condition '${schema.implementationName}'`);
+      }
+
+      this.props.setCustomFormatSpecificationFieldValue({ name: key, value });
+    }
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <ImportCustomFormatModalContent
+        {...this.props}
+        onImportPress={this.onImportPress}
+      />
+    );
+  }
+}
+
+ImportCustomFormatModalContentConnector.propTypes = {
+  specificationSchema: PropTypes.arrayOf(PropTypes.object).isRequired,
+  clearPendingChanges: PropTypes.func.isRequired,
+  deleteAllCustomFormatSpecification: PropTypes.func.isRequired,
+  clearCustomFormatSpecificationPending: PropTypes.func.isRequired,
+  saveCustomFormatSpecification: PropTypes.func.isRequired,
+  fetchCustomFormatSpecificationSchema: PropTypes.func.isRequired,
+  selectCustomFormatSpecificationSchema: PropTypes.func.isRequired,
+  setCustomFormatSpecificationValue: PropTypes.func.isRequired,
+  setCustomFormatSpecificationFieldValue: PropTypes.func.isRequired,
+  setCustomFormatValue: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(ImportCustomFormatModalContentConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.css b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.css
new file mode 100644
index 000000000..eabcae750
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.css
@@ -0,0 +1,44 @@
+.specification {
+  composes: card from '~Components/Card.css';
+
+  position: relative;
+  width: 300px;
+  height: 100px;
+}
+
+.underlay {
+  @add-mixin cover;
+}
+
+.overlay {
+  @add-mixin linkOverlay;
+
+  padding: 10px;
+}
+
+.name {
+  text-align: center;
+  font-weight: lighter;
+  font-size: 24px;
+}
+
+.actions {
+  margin-top: 20px;
+  text-align: right;
+}
+
+.presetsMenu {
+  composes: menu from '~Components/Menu/Menu.css';
+
+  display: inline-block;
+  margin: 0 5px;
+}
+
+.presetsMenuButton {
+  composes: button from '~Components/Link/Button.css';
+
+  &::after {
+    margin-left: 5px;
+    content: '\25BE';
+  }
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js
new file mode 100644
index 000000000..3ca832977
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js
@@ -0,0 +1,110 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from 'Components/Link/Button';
+import Link from 'Components/Link/Link';
+import Menu from 'Components/Menu/Menu';
+import MenuContent from 'Components/Menu/MenuContent';
+import { sizes } from 'Helpers/Props';
+import AddSpecificationPresetMenuItem from './AddSpecificationPresetMenuItem';
+import styles from './AddSpecificationItem.css';
+
+class AddSpecificationItem extends Component {
+
+  //
+  // Listeners
+
+  onSpecificationSelect = () => {
+    const {
+      implementation
+    } = this.props;
+
+    this.props.onSpecificationSelect({ implementation });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      implementation,
+      implementationName,
+      infoLink,
+      presets,
+      onSpecificationSelect
+    } = this.props;
+
+    const hasPresets = !!presets && !!presets.length;
+
+    return (
+      <div
+        className={styles.specification}
+      >
+        <Link
+          className={styles.underlay}
+          onPress={this.onSpecificationSelect}
+        />
+
+        <div className={styles.overlay}>
+          <div className={styles.name}>
+            {implementationName}
+          </div>
+
+          <div className={styles.actions}>
+            {
+              hasPresets &&
+                <span>
+                  <Button
+                    size={sizes.SMALL}
+                    onPress={this.onSpecificationSelect}
+                  >
+                    Custom
+                  </Button>
+
+                  <Menu className={styles.presetsMenu}>
+                    <Button
+                      className={styles.presetsMenuButton}
+                      size={sizes.SMALL}
+                    >
+                      Presets
+                    </Button>
+
+                    <MenuContent>
+                      {
+                        presets.map((preset, index) => {
+                          return (
+                            <AddSpecificationPresetMenuItem
+                              key={index}
+                              name={preset.name}
+                              implementation={implementation}
+                              onPress={onSpecificationSelect}
+                            />
+                          );
+                        })
+                      }
+                    </MenuContent>
+                  </Menu>
+                </span>
+            }
+
+            <Button
+              to={infoLink}
+              size={sizes.SMALL}
+            >
+              More Info
+            </Button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+AddSpecificationItem.propTypes = {
+  implementation: PropTypes.string.isRequired,
+  implementationName: PropTypes.string.isRequired,
+  infoLink: PropTypes.string.isRequired,
+  presets: PropTypes.arrayOf(PropTypes.object),
+  onSpecificationSelect: PropTypes.func.isRequired
+};
+
+export default AddSpecificationItem;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModal.js
new file mode 100644
index 000000000..19d8a4335
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModal.js
@@ -0,0 +1,25 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import AddSpecificationModalContentConnector from './AddSpecificationModalContentConnector';
+
+function AddSpecificationModal({ isOpen, onModalClose, ...otherProps }) {
+  return (
+    <Modal
+      isOpen={isOpen}
+      onModalClose={onModalClose}
+    >
+      <AddSpecificationModalContentConnector
+        {...otherProps}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+AddSpecificationModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default AddSpecificationModal;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.css b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.css
new file mode 100644
index 000000000..d51349ea9
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.css
@@ -0,0 +1,5 @@
+.specifications {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js
new file mode 100644
index 000000000..f97f084f5
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js
@@ -0,0 +1,101 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Alert from 'Components/Alert';
+import Button from 'Components/Link/Button';
+import Link from 'Components/Link/Link';
+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 { kinds } from 'Helpers/Props';
+import AddSpecificationItem from './AddSpecificationItem';
+import styles from './AddSpecificationModalContent.css';
+
+class AddSpecificationModalContent extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isSchemaFetching,
+      isSchemaPopulated,
+      schemaError,
+      schema,
+      onSpecificationSelect,
+      onModalClose
+    } = this.props;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+        <ModalHeader>
+          Add Condition
+        </ModalHeader>
+
+        <ModalBody>
+          {
+            isSchemaFetching &&
+              <LoadingIndicator />
+          }
+
+          {
+            !isSchemaFetching && !!schemaError &&
+              <div>
+                {'Unable to add a new condition, please try again.'}
+              </div>
+          }
+
+          {
+            isSchemaPopulated && !schemaError &&
+              <div>
+
+                <Alert kind={kinds.INFO}>
+                  <div>
+                    {'Lidarr supports custom conditions against the release properties below.'}
+                  </div>
+                  <div>
+                    {'Visit the wiki for more details: '}
+                    <Link to="https://wiki.servarr.com/lidarr/settings#custom-formats-2">{'Wiki'}</Link>
+                  </div>
+                </Alert>
+
+                <div className={styles.specifications}>
+                  {
+                    schema.map((specification) => {
+                      return (
+                        <AddSpecificationItem
+                          key={specification.implementation}
+                          {...specification}
+                          onSpecificationSelect={onSpecificationSelect}
+                        />
+                      );
+                    })
+                  }
+                </div>
+
+              </div>
+          }
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            onPress={onModalClose}
+          >
+            Close
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+AddSpecificationModalContent.propTypes = {
+  isSchemaFetching: PropTypes.bool.isRequired,
+  isSchemaPopulated: PropTypes.bool.isRequired,
+  schemaError: PropTypes.object,
+  schema: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onSpecificationSelect: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default AddSpecificationModalContent;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContentConnector.js
new file mode 100644
index 000000000..72b524b33
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContentConnector.js
@@ -0,0 +1,70 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchCustomFormatSpecificationSchema, selectCustomFormatSpecificationSchema } from 'Store/Actions/settingsActions';
+import AddSpecificationModalContent from './AddSpecificationModalContent';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.customFormatSpecifications,
+    (specifications) => {
+      const {
+        isSchemaFetching,
+        isSchemaPopulated,
+        schemaError,
+        schema
+      } = specifications;
+
+      return {
+        isSchemaFetching,
+        isSchemaPopulated,
+        schemaError,
+        schema
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  fetchCustomFormatSpecificationSchema,
+  selectCustomFormatSpecificationSchema
+};
+
+class AddSpecificationModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    this.props.fetchCustomFormatSpecificationSchema();
+  }
+
+  //
+  // Listeners
+
+  onSpecificationSelect = ({ implementation, name }) => {
+    this.props.selectCustomFormatSpecificationSchema({ implementation, presetName: name });
+    this.props.onModalClose({ specificationSelected: true });
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <AddSpecificationModalContent
+        {...this.props}
+        onSpecificationSelect={this.onSpecificationSelect}
+      />
+    );
+  }
+}
+
+AddSpecificationModalContentConnector.propTypes = {
+  fetchCustomFormatSpecificationSchema: PropTypes.func.isRequired,
+  selectCustomFormatSpecificationSchema: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(AddSpecificationModalContentConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationPresetMenuItem.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationPresetMenuItem.js
new file mode 100644
index 000000000..6189de040
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationPresetMenuItem.js
@@ -0,0 +1,49 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import MenuItem from 'Components/Menu/MenuItem';
+
+class AddSpecificationPresetMenuItem extends Component {
+
+  //
+  // Listeners
+
+  onPress = () => {
+    const {
+      name,
+      implementation
+    } = this.props;
+
+    this.props.onPress({
+      name,
+      implementation
+    });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      name,
+      implementation,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <MenuItem
+        {...otherProps}
+        onPress={this.onPress}
+      >
+        {name}
+      </MenuItem>
+    );
+  }
+}
+
+AddSpecificationPresetMenuItem.propTypes = {
+  name: PropTypes.string.isRequired,
+  implementation: PropTypes.string.isRequired,
+  onPress: PropTypes.func.isRequired
+};
+
+export default AddSpecificationPresetMenuItem;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js
new file mode 100644
index 000000000..b5c287c35
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js
@@ -0,0 +1,27 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import EditSpecificationModalContentConnector from './EditSpecificationModalContentConnector';
+
+function EditSpecificationModal({ isOpen, onModalClose, ...otherProps }) {
+  return (
+    <Modal
+      size={sizes.MEDIUM}
+      isOpen={isOpen}
+      onModalClose={onModalClose}
+    >
+      <EditSpecificationModalContentConnector
+        {...otherProps}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+EditSpecificationModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default EditSpecificationModal;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalConnector.js
new file mode 100644
index 000000000..a2865444b
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalConnector.js
@@ -0,0 +1,50 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { clearPendingChanges } from 'Store/Actions/baseActions';
+import EditSpecificationModal from './EditSpecificationModal';
+
+function createMapDispatchToProps(dispatch, props) {
+  const section = 'settings.customFormatSpecifications';
+
+  return {
+    dispatchClearPendingChanges() {
+      dispatch(clearPendingChanges({ section }));
+    }
+  };
+}
+
+class EditSpecificationModalConnector extends Component {
+
+  //
+  // Listeners
+
+  onModalClose = () => {
+    this.props.dispatchClearPendingChanges();
+    this.props.onModalClose();
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      dispatchClearPendingChanges,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <EditSpecificationModal
+        {...otherProps}
+        onModalClose={this.onModalClose}
+      />
+    );
+  }
+}
+
+EditSpecificationModalConnector.propTypes = {
+  onModalClose: PropTypes.func.isRequired,
+  dispatchClearPendingChanges: PropTypes.func.isRequired
+};
+
+export default connect(null, createMapDispatchToProps)(EditSpecificationModalConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.css b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.css
new file mode 100644
index 000000000..a2b6014df
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.css
@@ -0,0 +1,5 @@
+.deleteButton {
+  composes: button from '~Components/Link/Button.css';
+
+  margin-right: auto;
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js
new file mode 100644
index 000000000..2364f5746
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js
@@ -0,0 +1,160 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Alert from 'Components/Alert';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
+import Button from 'Components/Link/Button';
+import Link from 'Components/Link/Link';
+import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+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 styles from './EditSpecificationModalContent.css';
+
+function EditSpecificationModalContent(props) {
+  const {
+    advancedSettings,
+    item,
+    onInputChange,
+    onFieldChange,
+    onCancelPress,
+    onSavePress,
+    onDeleteSpecificationPress,
+    ...otherProps
+  } = props;
+
+  const {
+    id,
+    implementationName,
+    name,
+    negate,
+    required,
+    fields
+  } = item;
+
+  return (
+    <ModalContent onModalClose={onCancelPress}>
+      <ModalHeader>
+        {`${id ? 'Edit' : 'Add'} Condition - ${implementationName}`}
+      </ModalHeader>
+
+      <ModalBody>
+        <Form
+          {...otherProps}
+        >
+          {
+            fields && fields.some((x) => x.label === 'Regular Expression') &&
+              <Alert kind={kinds.INFO}>
+                <div>
+                  <div dangerouslySetInnerHTML={{ __html: 'This condition matches using Regular Expressions. Note that the characters <code>\\^$.|?*+()[{</code> have special meanings and need escaping with a <code>\\</code>' }} />
+                  {'More details'} <Link to="https://www.regular-expressions.info/tutorial.html">{'Here'}</Link>
+                </div>
+                <div>
+                  {'Regular expressions can be tested '}
+                  <Link to="http://regexstorm.net/tester">Here</Link>
+                </div>
+              </Alert>
+          }
+
+          <FormGroup>
+            <FormLabel>
+              Name
+            </FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.TEXT}
+              name="name"
+              {...name}
+              onChange={onInputChange}
+            />
+          </FormGroup>
+
+          {
+            fields && fields.map((field) => {
+              return (
+                <ProviderFieldFormGroup
+                  key={field.name}
+                  advancedSettings={advancedSettings}
+                  provider="specifications"
+                  providerData={item}
+                  {...field}
+                  onChange={onFieldChange}
+                />
+              );
+            })
+          }
+
+          <FormGroup>
+            <FormLabel>
+              Negate
+            </FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="negate"
+              {...negate}
+              helpText={`If checked, the custom format will not apply if this ${implementationName} condition matches.`}
+              onChange={onInputChange}
+            />
+          </FormGroup>
+
+          <FormGroup>
+            <FormLabel>
+              Required
+            </FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="required"
+              {...required}
+              helpText={`This ${implementationName} condition must match for the custom format to apply.  Otherwise a single ${implementationName} match is sufficient.`}
+              onChange={onInputChange}
+            />
+          </FormGroup>
+        </Form>
+      </ModalBody>
+      <ModalFooter>
+        {
+          id &&
+            <Button
+              className={styles.deleteButton}
+              kind={kinds.DANGER}
+              onPress={onDeleteSpecificationPress}
+            >
+              Delete
+            </Button>
+        }
+
+        <Button
+          onPress={onCancelPress}
+        >
+          Cancel
+        </Button>
+
+        <SpinnerErrorButton
+          isSpinning={false}
+          onPress={onSavePress}
+        >
+          Save
+        </SpinnerErrorButton>
+      </ModalFooter>
+    </ModalContent>
+  );
+}
+
+EditSpecificationModalContent.propTypes = {
+  advancedSettings: PropTypes.bool.isRequired,
+  item: PropTypes.object.isRequired,
+  onInputChange: PropTypes.func.isRequired,
+  onFieldChange: PropTypes.func.isRequired,
+  onCancelPress: PropTypes.func.isRequired,
+  onSavePress: PropTypes.func.isRequired,
+  onDeleteSpecificationPress: PropTypes.func
+};
+
+export default EditSpecificationModalContent;
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js
new file mode 100644
index 000000000..b56993dfb
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js
@@ -0,0 +1,78 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { clearCustomFormatSpecificationPending, saveCustomFormatSpecification, setCustomFormatSpecificationFieldValue, setCustomFormatSpecificationValue } from 'Store/Actions/settingsActions';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
+import EditSpecificationModalContent from './EditSpecificationModalContent';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.advancedSettings,
+    createProviderSettingsSelector('customFormatSpecifications'),
+    (advancedSettings, specification) => {
+      return {
+        advancedSettings,
+        ...specification
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  setCustomFormatSpecificationValue,
+  setCustomFormatSpecificationFieldValue,
+  saveCustomFormatSpecification,
+  clearCustomFormatSpecificationPending
+};
+
+class EditSpecificationModalContentConnector extends Component {
+
+  //
+  // Listeners
+
+  onInputChange = ({ name, value }) => {
+    this.props.setCustomFormatSpecificationValue({ name, value });
+  };
+
+  onFieldChange = ({ name, value }) => {
+    this.props.setCustomFormatSpecificationFieldValue({ name, value });
+  };
+
+  onCancelPress = () => {
+    this.props.clearCustomFormatSpecificationPending();
+    this.props.onModalClose();
+  };
+
+  onSavePress = () => {
+    this.props.saveCustomFormatSpecification({ id: this.props.id });
+    this.props.onModalClose();
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EditSpecificationModalContent
+        {...this.props}
+        onCancelPress={this.onCancelPress}
+        onSavePress={this.onSavePress}
+        onInputChange={this.onInputChange}
+        onFieldChange={this.onFieldChange}
+      />
+    );
+  }
+}
+
+EditSpecificationModalContentConnector.propTypes = {
+  id: PropTypes.number,
+  item: PropTypes.object.isRequired,
+  setCustomFormatSpecificationValue: PropTypes.func.isRequired,
+  setCustomFormatSpecificationFieldValue: PropTypes.func.isRequired,
+  clearCustomFormatSpecificationPending: PropTypes.func.isRequired,
+  saveCustomFormatSpecification: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(EditSpecificationModalContentConnector);
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.css b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.css
new file mode 100644
index 000000000..f05c942b0
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.css
@@ -0,0 +1,38 @@
+.customFormat {
+  composes: card from '~Components/Card.css';
+
+  width: 300px;
+}
+
+.nameContainer {
+  display: flex;
+  justify-content: space-between;
+}
+
+.name {
+  @add-mixin truncate;
+
+  margin-bottom: 20px;
+  font-weight: 300;
+  font-size: 24px;
+}
+
+.cloneButton {
+  composes: button from '~Components/Link/IconButton.css';
+
+  height: 36px;
+}
+
+.labels {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 5px;
+  pointer-events: all;
+}
+
+.tooltipLabel {
+  composes: label from '~Components/Label.css';
+
+  margin: 0;
+  border: none;
+}
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js
new file mode 100644
index 000000000..5a75cb0fd
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js
@@ -0,0 +1,139 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Card from 'Components/Card';
+import Label from 'Components/Label';
+import IconButton from 'Components/Link/IconButton';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
+import { icons, kinds } from 'Helpers/Props';
+import EditSpecificationModalConnector from './EditSpecificationModal';
+import styles from './Specification.css';
+
+class Specification extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isEditSpecificationModalOpen: false,
+      isDeleteSpecificationModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onEditSpecificationPress = () => {
+    this.setState({ isEditSpecificationModalOpen: true });
+  };
+
+  onEditSpecificationModalClose = () => {
+    this.setState({ isEditSpecificationModalOpen: false });
+  };
+
+  onDeleteSpecificationPress = () => {
+    this.setState({
+      isEditSpecificationModalOpen: false,
+      isDeleteSpecificationModalOpen: true
+    });
+  };
+
+  onDeleteSpecificationModalClose = () => {
+    this.setState({ isDeleteSpecificationModalOpen: false });
+  };
+
+  onCloneSpecificationPress = () => {
+    this.props.onCloneSpecificationPress(this.props.id);
+  };
+
+  onConfirmDeleteSpecification = () => {
+    this.props.onConfirmDeleteSpecification(this.props.id);
+  };
+
+  //
+  // Lifecycle
+
+  render() {
+    const {
+      id,
+      implementationName,
+      name,
+      required,
+      negate
+    } = this.props;
+
+    return (
+      <Card
+        className={styles.customFormat}
+        overlayContent={true}
+        onPress={this.onEditSpecificationPress}
+      >
+        <div className={styles.nameContainer}>
+          <div className={styles.name}>
+            {name}
+          </div>
+
+          <IconButton
+            className={styles.cloneButton}
+            title="Clone"
+            name={icons.CLONE}
+            onPress={this.onCloneSpecificationPress}
+          />
+        </div>
+
+        <div className={styles.labels}>
+          <Label kind={kinds.DEFAULT}>
+            {implementationName}
+          </Label>
+
+          {
+            negate &&
+              <Label kind={kinds.DANGER}>
+                Negated
+              </Label>
+          }
+
+          {
+            required &&
+              <Label kind={kinds.SUCCESS}>
+                Required
+              </Label>
+          }
+        </div>
+
+        <EditSpecificationModalConnector
+          id={id}
+          isOpen={this.state.isEditSpecificationModalOpen}
+          onModalClose={this.onEditSpecificationModalClose}
+          onDeleteSpecificationPress={this.onDeleteSpecificationPress}
+        />
+
+        <ConfirmModal
+          isOpen={this.state.isDeleteSpecificationModalOpen}
+          kind={kinds.DANGER}
+          title="Delete Format"
+          message={`Are you sure you want to delete format tag ${name} ?`}
+          confirmLabel="Delete"
+          onConfirm={this.onConfirmDeleteSpecification}
+          onCancel={this.onDeleteSpecificationModalClose}
+        />
+      </Card>
+    );
+  }
+}
+
+Specification.propTypes = {
+  id: PropTypes.number.isRequired,
+  implementation: PropTypes.string.isRequired,
+  implementationName: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  negate: PropTypes.bool.isRequired,
+  required: PropTypes.bool.isRequired,
+  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onConfirmDeleteSpecification: PropTypes.func.isRequired,
+  onCloneSpecificationPress: PropTypes.func.isRequired
+};
+
+export default Specification;
diff --git a/frontend/src/Settings/MediaManagement/MediaManagement.js b/frontend/src/Settings/MediaManagement/MediaManagement.js
index 37c0bb9b6..39e0fec25 100644
--- a/frontend/src/Settings/MediaManagement/MediaManagement.js
+++ b/frontend/src/Settings/MediaManagement/MediaManagement.js
@@ -254,7 +254,7 @@ class MediaManagement extends Component {
                       ]}
                       helpTextWarning={
                         settings.downloadPropersAndRepacks.value === 'doNotPrefer' ?
-                          'Use preferred words for automatic upgrades to propers/repacks' :
+                          'Use custom formats for automatic upgrades to propers/repacks' :
                           undefined
                       }
                       values={downloadPropersAndRepacksOptions}
diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
index d7bc79650..48917c59c 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -110,7 +110,7 @@ const mediaInfoTokens = [
 
 const otherTokens = [
   { token: '{Release Group}', example: 'Rls Grp' },
-  { token: '{Preferred Words}', example: 'iNTERNAL' }
+  { token: '{Custom Formats}', example: 'iNTERNAL' }
 ];
 
 const originalTokens = [
diff --git a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
index b31e7ce5c..ac5375d91 100644
--- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
@@ -46,6 +46,9 @@ function EditDelayProfileModalContent(props) {
     enableTorrent,
     usenetDelay,
     torrentDelay,
+    bypassIfHighestQuality,
+    bypassIfAboveCustomFormatScore,
+    minimumCustomFormatScore,
     tags
   } = item;
 
@@ -87,7 +90,7 @@ function EditDelayProfileModalContent(props) {
               </FormGroup>
 
               {
-                enableUsenet.value &&
+                enableUsenet.value ?
                   <FormGroup>
                     <FormLabel>{translate('UsenetDelay')}</FormLabel>
 
@@ -99,11 +102,12 @@ function EditDelayProfileModalContent(props) {
                       helpText={translate('UsenetDelayHelpText')}
                       onChange={onInputChange}
                     />
-                  </FormGroup>
+                  </FormGroup> :
+                  null
               }
 
               {
-                enableTorrent.value &&
+                enableTorrent.value ?
                   <FormGroup>
                     <FormLabel>{translate('TorrentDelay')}</FormLabel>
 
@@ -115,7 +119,48 @@ function EditDelayProfileModalContent(props) {
                       helpText={translate('TorrentDelayHelpText')}
                       onChange={onInputChange}
                     />
-                  </FormGroup>
+                  </FormGroup> :
+                  null
+              }
+
+              <FormGroup>
+                <FormLabel>{translate('BypassIfHighestQuality')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.CHECK}
+                  name="bypassIfHighestQuality"
+                  {...bypassIfHighestQuality}
+                  helpText={translate('BypassIfHighestQualityHelpText')}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>{translate('BypassIfAboveCustomFormatScore')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.CHECK}
+                  name="bypassIfAboveCustomFormatScore"
+                  {...bypassIfAboveCustomFormatScore}
+                  helpText={translate('BypassIfAboveCustomFormatScoreHelpText')}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              {
+                bypassIfAboveCustomFormatScore.value ?
+                  <FormGroup>
+                    <FormLabel>{translate('MinimumCustomFormatScore')}</FormLabel>
+
+                    <FormInputGroup
+                      type={inputTypes.NUMBER}
+                      name="minimumCustomFormatScore"
+                      {...minimumCustomFormatScore}
+                      helpText={translate('MinimumCustomFormatScoreHelpText')}
+                      onChange={onInputChange}
+                    />
+                  </FormGroup> :
+                  null
               }
 
               {
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
index 2f6589933..586f99e70 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
@@ -3,7 +3,8 @@
   flex-wrap: wrap;
 }
 
-.formGroupWrapper {
+.formGroupWrapper,
+.formatItemLarge {
   flex: 0 0 calc($formGroupSmallWidth - 100px);
 }
 
@@ -11,8 +12,20 @@
   margin-right: auto;
 }
 
-@media only screen and (max-width: $breakpointLarge) {
+.formatItemSmall {
+  display: none;
+}
+
+@media only screen and (max-width: calc($breakpointLarge + 100px)) {
   .formGroupsContainer {
     display: block;
   }
+
+  .formatItemSmall {
+    display: block;
+  }
+
+  .formatItemLarge {
+    display: none;
+  }
 }
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
index b275792e8..a3b17dc1b 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
@@ -15,11 +15,23 @@ import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds, sizes } from 'Helpers/Props';
 import dimensions from 'Styles/Variables/dimensions';
 import translate from 'Utilities/String/translate';
+import QualityProfileFormatItems from './QualityProfileFormatItems';
 import QualityProfileItems from './QualityProfileItems';
 import styles from './EditQualityProfileModalContent.css';
 
 const MODAL_BODY_PADDING = parseInt(dimensions.modalBodyPadding);
 
+function getCustomFormatRender(formatItems, otherProps) {
+  return (
+    <QualityProfileFormatItems
+      profileFormatItems={formatItems.value}
+      errors={formatItems.errors}
+      warnings={formatItems.warnings}
+      {...otherProps}
+    />
+  );
+}
+
 class EditQualityProfileModalContent extends Component {
 
   //
@@ -93,6 +105,7 @@ class EditQualityProfileModalContent extends Component {
       isSaving,
       saveError,
       qualities,
+      customFormats,
       item,
       isInUse,
       onInputChange,
@@ -108,7 +121,10 @@ class EditQualityProfileModalContent extends Component {
       name,
       upgradeAllowed,
       cutoff,
-      items
+      minFormatScore,
+      cutoffFormatScore,
+      items,
+      formatItems
     } = item;
 
     return (
@@ -190,6 +206,44 @@ class EditQualityProfileModalContent extends Component {
                               />
                             </FormGroup>
                         }
+
+                        {
+                          formatItems.value.length > 0 &&
+                            <FormGroup size={sizes.EXTRA_SMALL}>
+                              <FormLabel size={sizes.SMALL}>
+                                Minimum Custom Format Score
+                              </FormLabel>
+
+                              <FormInputGroup
+                                type={inputTypes.NUMBER}
+                                name="minFormatScore"
+                                {...minFormatScore}
+                                helpText="Minimum custom format score allowed to download"
+                                onChange={onInputChange}
+                              />
+                            </FormGroup>
+                        }
+
+                        {
+                          upgradeAllowed.value && formatItems.value.length > 0 &&
+                            <FormGroup size={sizes.EXTRA_SMALL}>
+                              <FormLabel size={sizes.SMALL}>
+                                Upgrade Until Custom Format Score
+                              </FormLabel>
+
+                              <FormInputGroup
+                                type={inputTypes.NUMBER}
+                                name="cutoffFormatScore"
+                                {...cutoffFormatScore}
+                                helpText="Once this custom format score is reached Lidarr will no longer grab album releases"
+                                onChange={onInputChange}
+                              />
+                            </FormGroup>
+                        }
+
+                        <div className={styles.formatItemLarge}>
+                          {getCustomFormatRender(formatItems, ...otherProps)}
+                        </div>
                       </div>
 
                       <div className={styles.formGroupWrapper}>
@@ -201,6 +255,10 @@ class EditQualityProfileModalContent extends Component {
                           {...otherProps}
                         />
                       </div>
+
+                      <div className={styles.formatItemSmall}>
+                        {getCustomFormatRender(formatItems, otherProps)}
+                      </div>
                     </div>
                   </Form>
 
@@ -216,7 +274,7 @@ class EditQualityProfileModalContent extends Component {
         >
           <ModalFooter>
             {
-              id &&
+              id ?
                 <div
                   className={styles.deleteButtonContainer}
                   title={isInUse ? translate('IsInUseCantDeleteAQualityProfileThatIsAttachedToAnArtistOrImportList') : undefined}
@@ -228,7 +286,8 @@ class EditQualityProfileModalContent extends Component {
                   >
                     {translate('Delete')}
                   </Button>
-                </div>
+                </div> :
+                null
             }
 
             <Button
@@ -258,6 +317,7 @@ EditQualityProfileModalContent.propTypes = {
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
   qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   item: PropTypes.object.isRequired,
   isInUse: PropTypes.bool.isRequired,
   onInputChange: PropTypes.func.isRequired,
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
index 49d0bd4b6..de92e998b 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
@@ -61,14 +61,46 @@ function createQualitiesSelector() {
   );
 }
 
+function createFormatsSelector() {
+  return createSelector(
+    createProviderSettingsSelector('qualityProfiles'),
+    (customFormat) => {
+      const items = customFormat.item.formatItems;
+      if (!items || !items.value) {
+        return [];
+      }
+
+      return _.reduceRight(items.value, (result, { id, name, format, score }) => {
+        if (id) {
+          result.push({
+            key: id,
+            value: name,
+            score
+          });
+        } else {
+          result.push({
+            key: format,
+            value: name,
+            score
+          });
+        }
+
+        return result;
+      }, []);
+    }
+  );
+}
+
 function createMapStateToProps() {
   return createSelector(
     createProviderSettingsSelector('qualityProfiles'),
     createQualitiesSelector(),
+    createFormatsSelector(),
     createProfileInUseSelector('qualityProfileId'),
-    (qualityProfile, qualities, isInUse) => {
+    (qualityProfile, qualities, customFormats, isInUse) => {
       return {
         qualities,
+        customFormats,
         ...qualityProfile,
         isInUse
       };
@@ -178,6 +210,19 @@ class EditQualityProfileModalContentConnector extends Component {
     this.ensureCutoff(qualityProfile);
   };
 
+  onQualityProfileFormatItemScoreChange = (id, score) => {
+    const qualityProfile = _.cloneDeep(this.props.item);
+    const formatItems = qualityProfile.formatItems.value;
+    const item = _.find(qualityProfile.formatItems.value, (i) => i.format === id);
+
+    item.score = score;
+
+    this.props.setQualityProfileValue({
+      name: 'formatItems',
+      value: formatItems
+    });
+  };
+
   onItemGroupAllowedChange = (id, allowed) => {
     const qualityProfile = _.cloneDeep(this.props.item);
     const items = qualityProfile.items.value;
@@ -420,6 +465,7 @@ class EditQualityProfileModalContentConnector extends Component {
         onItemGroupNameChange={this.onItemGroupNameChange}
         onQualityProfileItemDragMove={this.onQualityProfileItemDragMove}
         onQualityProfileItemDragEnd={this.onQualityProfileItemDragEnd}
+        onQualityProfileFormatItemScoreChange={this.onQualityProfileFormatItemScoreChange}
         onToggleEditGroupsMode={this.onToggleEditGroupsMode}
       />
     );
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.css b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.css
new file mode 100644
index 000000000..4f235ba35
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.css
@@ -0,0 +1,45 @@
+.qualityProfileFormatItemContainer {
+  display: flex;
+  padding: $qualityProfileItemDragSourcePadding 0;
+  width: 100%;
+}
+
+.qualityProfileFormatItem {
+  display: flex;
+  align-items: stretch;
+  width: 100%;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  background: var(--inputBackgroundColor);
+}
+
+.formatNameContainer {
+  display: flex;
+  flex-grow: 1;
+  margin-bottom: 0;
+  margin-left: 14px;
+  width: 100%;
+  font-weight: normal;
+  line-height: $qualityProfileItemHeight;
+  cursor: text;
+}
+
+.formatName {
+  display: flex;
+  flex-grow: 1;
+}
+
+.scoreContainer {
+  display: flex;
+  flex-grow: 0;
+}
+
+.scoreInput {
+  composes: input from '~Components/Form/Input.css';
+
+  width: 100px;
+  height: 30px;
+  border: unset;
+  border-radius: unset;
+  background-color: unset;
+}
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.js b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.js
new file mode 100644
index 000000000..5ef4add2d
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItem.js
@@ -0,0 +1,68 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import NumberInput from 'Components/Form/NumberInput';
+import styles from './QualityProfileFormatItem.css';
+
+class QualityProfileFormatItem extends Component {
+
+  //
+  // Listeners
+
+  onScoreChange = ({ value }) => {
+    const {
+      formatId
+    } = this.props;
+
+    this.props.onScoreChange(formatId, value);
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      name,
+      score
+    } = this.props;
+
+    return (
+      <div
+        className={styles.qualityProfileFormatItemContainer}
+      >
+        <div
+          className={styles.qualityProfileFormatItem}
+        >
+          <label
+            className={styles.formatNameContainer}
+          >
+            <div className={styles.formatName}>
+              {name}
+            </div>
+            <NumberInput
+              containerClassName={styles.scoreContainer}
+              className={styles.scoreInput}
+              name={name}
+              value={score}
+              onChange={this.onScoreChange}
+            />
+          </label>
+
+        </div>
+      </div>
+    );
+  }
+}
+
+QualityProfileFormatItem.propTypes = {
+  formatId: PropTypes.number.isRequired,
+  name: PropTypes.string.isRequired,
+  score: PropTypes.number.isRequired,
+  onScoreChange: PropTypes.func
+};
+
+QualityProfileFormatItem.defaultProps = {
+  // To handle the case score is deleted during edit
+  score: 0
+};
+
+export default QualityProfileFormatItem;
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.css b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.css
new file mode 100644
index 000000000..def839960
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.css
@@ -0,0 +1,31 @@
+.formats {
+  margin-top: 10px;
+  /* TODO: This should consider the number of languages in the list */
+  user-select: none;
+}
+
+.headerContainer {
+  display: flex;
+  font-weight: bold;
+  line-height: 35px;
+}
+
+.headerTitle {
+  display: flex;
+  flex-grow: 1;
+}
+
+.headerScore {
+  display: flex;
+  flex-grow: 0;
+  padding-left: 16px;
+  width: 100px;
+}
+
+.addCustomFormatMessage {
+  max-width: $formGroupExtraSmallWidth;
+  color: var(--helpTextColor);
+  text-align: center;
+  font-weight: 300;
+  font-size: 20px;
+}
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js
new file mode 100644
index 000000000..6363aed5c
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js
@@ -0,0 +1,159 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputHelpText from 'Components/Form/FormInputHelpText';
+import FormLabel from 'Components/Form/FormLabel';
+import Link from 'Components/Link/Link';
+import { sizes } from 'Helpers/Props';
+import QualityProfileFormatItem from './QualityProfileFormatItem';
+import styles from './QualityProfileFormatItems.css';
+
+function calcOrder(profileFormatItems) {
+  const items = profileFormatItems.reduce((acc, cur, index) => {
+    acc[cur.format] = index;
+    return acc;
+  }, {});
+
+  return [...profileFormatItems].sort((a, b) => {
+    if (b.score !== a.score) {
+      return b.score - a.score;
+    }
+    return a.name > b.name ? 1 : -1;
+  }).map((x) => items[x.format]);
+}
+
+class QualityProfileFormatItems extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      order: calcOrder(this.props.profileFormatItems)
+    };
+  }
+
+  //
+  // Listeners
+
+  onScoreChange = (formatId, value) => {
+    const {
+      onQualityProfileFormatItemScoreChange
+    } = this.props;
+
+    onQualityProfileFormatItemScoreChange(formatId, value);
+    this.reorderItems();
+  };
+
+  reorderItems = _.debounce(() => this.setState({ order: calcOrder(this.props.profileFormatItems) }), 1000);
+
+  //
+  // Render
+
+  render() {
+    const {
+      profileFormatItems,
+      errors,
+      warnings
+    } = this.props;
+
+    const {
+      order
+    } = this.state;
+
+    if (profileFormatItems.length < 1) {
+      return (
+        <div className={styles.addCustomFormatMessage}>
+          {'Want more control over which downloads are preferred? Add a'}
+          <Link to='/settings/customformats'> Custom Format </Link>
+        </div>
+      );
+    }
+
+    return (
+      <FormGroup size={sizes.EXTRA_SMALL}>
+        <FormLabel size={sizes.SMALL}>
+          Custom Formats
+        </FormLabel>
+
+        <div>
+          <FormInputHelpText
+            text="Lidarr scores each release using the sum of scores for matching custom formats. If a new release would improve the score, at the same or better quality, then LIdarr will grab it."
+          />
+
+          {
+            errors.map((error, index) => {
+              return (
+                <FormInputHelpText
+                  key={index}
+                  text={error.message}
+                  isError={true}
+                  isCheckInput={false}
+                />
+              );
+            })
+          }
+
+          {
+            warnings.map((warning, index) => {
+              return (
+                <FormInputHelpText
+                  key={index}
+                  text={warning.message}
+                  isWarning={true}
+                  isCheckInput={false}
+                />
+              );
+            })
+          }
+
+          <div className={styles.formats}>
+            <div className={styles.headerContainer}>
+              <div className={styles.headerTitle}>
+                Custom Format
+              </div>
+              <div className={styles.headerScore}>
+                Score
+              </div>
+            </div>
+            {
+              order.map((index) => {
+                const {
+                  format,
+                  name,
+                  score
+                } = profileFormatItems[index];
+                return (
+                  <QualityProfileFormatItem
+                    key={format}
+                    formatId={format}
+                    name={name}
+                    score={score}
+                    onScoreChange={this.onScoreChange}
+                  />
+                );
+              })
+            }
+          </div>
+        </div>
+      </FormGroup>
+    );
+  }
+}
+
+QualityProfileFormatItems.propTypes = {
+  profileFormatItems: PropTypes.arrayOf(PropTypes.object).isRequired,
+  errors: PropTypes.arrayOf(PropTypes.object),
+  warnings: PropTypes.arrayOf(PropTypes.object),
+  onQualityProfileFormatItemScoreChange: PropTypes.func
+};
+
+QualityProfileFormatItems.defaultProps = {
+  errors: [],
+  warnings: []
+};
+
+export default QualityProfileFormatItems;
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
index 200a65cde..0698e6b52 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
@@ -14,8 +14,7 @@ import { inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './EditReleaseProfileModalContent.css';
 
-// Tab, enter, and comma
-const tagInputDelimiters = [9, 13, 188];
+const tagInputDelimiters = ['Tab', 'Enter'];
 
 function EditReleaseProfileModalContent(props) {
   const {
@@ -34,8 +33,6 @@ function EditReleaseProfileModalContent(props) {
     enabled,
     required,
     ignored,
-    preferred,
-    includePreferredWhenRenaming,
     tags,
     indexerId
   } = item;
@@ -96,41 +93,6 @@ function EditReleaseProfileModalContent(props) {
             />
           </FormGroup>
 
-          <FormGroup>
-            <FormLabel>
-              {translate('Preferred')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.KEY_VALUE_LIST}
-              name="preferred"
-              helpTexts={[
-                translate('PreferredHelpTexts1'),
-                translate('PreferredHelpTexts2'),
-                translate('PreferredHelpTexts3')
-              ]}
-              {...preferred}
-              keyPlaceholder={translate('Term')}
-              valuePlaceholder={translate('Score')}
-              onChange={onInputChange}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>
-              {translate('IncludePreferredWhenRenaming')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="includePreferredWhenRenaming"
-              helpText={indexerId.value === 0 ? translate('IndexerIdvalue0IncludeInPreferredWordsRenamingFormat') : translate('IndexerIdvalue0OnlySupportedWhenIndexerIsSetToAll')}
-              {...includePreferredWhenRenaming}
-              onChange={onInputChange}
-              isDisabled={indexerId.value !== 0}
-            />
-          </FormGroup>
-
           <FormGroup>
             <FormLabel>
               {translate('Indexer')}
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
index 45ae6b5e1..b14d72269 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
@@ -9,9 +9,8 @@ import EditReleaseProfileModalContent from './EditReleaseProfileModalContent';
 
 const newReleaseProfile = {
   enabled: true,
-  required: '',
-  ignored: '',
-  preferred: [],
+  required: [],
+  ignored: [],
   includePreferredWhenRenaming: false,
   tags: [],
   indexerId: 0
diff --git a/frontend/src/Settings/Profiles/Release/ReleaseProfile.css b/frontend/src/Settings/Profiles/Release/ReleaseProfile.css
index c1e2e59a2..09ba2b0c7 100644
--- a/frontend/src/Settings/Profiles/Release/ReleaseProfile.css
+++ b/frontend/src/Settings/Profiles/Release/ReleaseProfile.css
@@ -9,3 +9,9 @@
   flex-wrap: wrap;
   margin-top: 5px;
 }
+
+.label {
+  composes: label from '~Components/Label.css';
+
+  max-width: 100%;
+}
diff --git a/frontend/src/Settings/Profiles/Release/ReleaseProfile.js b/frontend/src/Settings/Profiles/Release/ReleaseProfile.js
index 239952b75..7883158d7 100644
--- a/frontend/src/Settings/Profiles/Release/ReleaseProfile.js
+++ b/frontend/src/Settings/Profiles/Release/ReleaseProfile.js
@@ -1,12 +1,12 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import MiddleTruncate from 'react-middle-truncate';
 import Card from 'Components/Card';
 import Label from 'Components/Label';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import TagList from 'Components/TagList';
 import { kinds } from 'Helpers/Props';
-import split from 'Utilities/String/split';
 import translate from 'Utilities/String/translate';
 import EditReleaseProfileModalConnector from './EditReleaseProfileModalConnector';
 import styles from './ReleaseProfile.css';
@@ -60,7 +60,6 @@ class ReleaseProfile extends Component {
       enabled,
       required,
       ignored,
-      preferred,
       tags,
       indexerId,
       tagList,
@@ -82,17 +81,22 @@ class ReleaseProfile extends Component {
       >
         <div>
           {
-            split(required).map((item) => {
+            required.map((item) => {
               if (!item) {
                 return null;
               }
 
               return (
                 <Label
+                  className={styles.label}
                   key={item}
                   kind={kinds.SUCCESS}
                 >
-                  {item}
+                  <MiddleTruncate
+                    text={item}
+                    start={10}
+                    end={10}
+                  />
                 </Label>
               );
             })
@@ -101,34 +105,22 @@ class ReleaseProfile extends Component {
 
         <div>
           {
-            preferred.map((item) => {
-              const isPreferred = item.value >= 0;
-
-              return (
-                <Label
-                  key={item.key}
-                  kind={isPreferred ? kinds.DEFAULT : kinds.WARNING}
-                >
-                  {item.key} {isPreferred && '+'}{item.value}
-                </Label>
-              );
-            })
-          }
-        </div>
-
-        <div>
-          {
-            split(ignored).map((item) => {
+            ignored.map((item) => {
               if (!item) {
                 return null;
               }
 
               return (
                 <Label
+                  className={styles.label}
                   key={item}
                   kind={kinds.DANGER}
                 >
-                  {item}
+                  <MiddleTruncate
+                    text={item}
+                    start={10}
+                    end={10}
+                  />
                 </Label>
               );
             })
@@ -186,9 +178,8 @@ class ReleaseProfile extends Component {
 ReleaseProfile.propTypes = {
   id: PropTypes.number.isRequired,
   enabled: PropTypes.bool.isRequired,
-  required: PropTypes.string.isRequired,
-  ignored: PropTypes.string.isRequired,
-  preferred: PropTypes.arrayOf(PropTypes.object).isRequired,
+  required: PropTypes.arrayOf(PropTypes.string).isRequired,
+  ignored: PropTypes.arrayOf(PropTypes.string).isRequired,
   tags: PropTypes.arrayOf(PropTypes.number).isRequired,
   indexerId: PropTypes.number.isRequired,
   tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -198,9 +189,8 @@ ReleaseProfile.propTypes = {
 
 ReleaseProfile.defaultProps = {
   enabled: true,
-  required: '',
-  ignored: '',
-  preferred: [],
+  required: [],
+  ignored: [],
   indexerId: 0
 };
 
diff --git a/frontend/src/Settings/Settings.js b/frontend/src/Settings/Settings.js
index 085acbd64..36f47d82e 100644
--- a/frontend/src/Settings/Settings.js
+++ b/frontend/src/Settings/Settings.js
@@ -47,6 +47,17 @@ function Settings() {
           Quality sizes and naming
         </div>
 
+        <Link
+          className={styles.link}
+          to="/settings/customformats"
+        >
+          Custom Formats
+        </Link>
+
+        <div className={styles.summary}>
+          Custom Formats and Settings
+        </div>
+
         <Link
           className={styles.link}
           to="/settings/indexers"
diff --git a/frontend/src/Store/Actions/Settings/customFormatSpecifications.js b/frontend/src/Store/Actions/Settings/customFormatSpecifications.js
new file mode 100644
index 000000000..d74898d3e
--- /dev/null
+++ b/frontend/src/Store/Actions/Settings/customFormatSpecifications.js
@@ -0,0 +1,193 @@
+import { createAction } from 'redux-actions';
+import { batchActions } from 'redux-batched-actions';
+import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler';
+import createClearReducer from 'Store/Actions/Creators/Reducers/createClearReducer';
+import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
+import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
+import { createThunk } from 'Store/thunks';
+import getNextId from 'Utilities/State/getNextId';
+import getProviderState from 'Utilities/State/getProviderState';
+import getSectionState from 'Utilities/State/getSectionState';
+import selectProviderSchema from 'Utilities/State/selectProviderSchema';
+import updateSectionState from 'Utilities/State/updateSectionState';
+import { removeItem, set, update, updateItem } from '../baseActions';
+
+//
+// Variables
+
+const section = 'settings.customFormatSpecifications';
+
+//
+// Actions Types
+
+export const FETCH_CUSTOM_FORMAT_SPECIFICATIONS = 'settings/customFormatSpecifications/fetchCustomFormatSpecifications';
+export const FETCH_CUSTOM_FORMAT_SPECIFICATION_SCHEMA = 'settings/customFormatSpecifications/fetchCustomFormatSpecificationSchema';
+export const SELECT_CUSTOM_FORMAT_SPECIFICATION_SCHEMA = 'settings/customFormatSpecifications/selectCustomFormatSpecificationSchema';
+export const SET_CUSTOM_FORMAT_SPECIFICATION_VALUE = 'settings/customFormatSpecifications/setCustomFormatSpecificationValue';
+export const SET_CUSTOM_FORMAT_SPECIFICATION_FIELD_VALUE = 'settings/customFormatSpecifications/setCustomFormatSpecificationFieldValue';
+export const SAVE_CUSTOM_FORMAT_SPECIFICATION = 'settings/customFormatSpecifications/saveCustomFormatSpecification';
+export const DELETE_CUSTOM_FORMAT_SPECIFICATION = 'settings/customFormatSpecifications/deleteCustomFormatSpecification';
+export const DELETE_ALL_CUSTOM_FORMAT_SPECIFICATION = 'settings/customFormatSpecifications/deleteAllCustomFormatSpecification';
+export const CLONE_CUSTOM_FORMAT_SPECIFICATION = 'settings/customFormatSpecifications/cloneCustomFormatSpecification';
+export const CLEAR_CUSTOM_FORMAT_SPECIFICATIONS = 'settings/customFormatSpecifications/clearCustomFormatSpecifications';
+export const CLEAR_CUSTOM_FORMAT_SPECIFICATION_PENDING = 'settings/customFormatSpecifications/clearCustomFormatSpecificationPending';
+//
+// Action Creators
+
+export const fetchCustomFormatSpecifications = createThunk(FETCH_CUSTOM_FORMAT_SPECIFICATIONS);
+export const fetchCustomFormatSpecificationSchema = createThunk(FETCH_CUSTOM_FORMAT_SPECIFICATION_SCHEMA);
+export const selectCustomFormatSpecificationSchema = createAction(SELECT_CUSTOM_FORMAT_SPECIFICATION_SCHEMA);
+
+export const saveCustomFormatSpecification = createThunk(SAVE_CUSTOM_FORMAT_SPECIFICATION);
+export const deleteCustomFormatSpecification = createThunk(DELETE_CUSTOM_FORMAT_SPECIFICATION);
+export const deleteAllCustomFormatSpecification = createThunk(DELETE_ALL_CUSTOM_FORMAT_SPECIFICATION);
+
+export const setCustomFormatSpecificationValue = createAction(SET_CUSTOM_FORMAT_SPECIFICATION_VALUE, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
+export const setCustomFormatSpecificationFieldValue = createAction(SET_CUSTOM_FORMAT_SPECIFICATION_FIELD_VALUE, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
+export const cloneCustomFormatSpecification = createAction(CLONE_CUSTOM_FORMAT_SPECIFICATION);
+
+export const clearCustomFormatSpecification = createAction(CLEAR_CUSTOM_FORMAT_SPECIFICATIONS);
+
+export const clearCustomFormatSpecificationPending = createThunk(CLEAR_CUSTOM_FORMAT_SPECIFICATION_PENDING);
+
+//
+// Details
+
+export default {
+
+  //
+  // State
+
+  defaultState: {
+    isPopulated: false,
+    error: null,
+    isSchemaFetching: false,
+    isSchemaPopulated: false,
+    schemaError: null,
+    schema: [],
+    selectedSchema: {},
+    isSaving: false,
+    saveError: null,
+    items: [],
+    pendingChanges: {}
+  },
+
+  //
+  // Action Handlers
+
+  actionHandlers: {
+    [FETCH_CUSTOM_FORMAT_SPECIFICATION_SCHEMA]: createFetchSchemaHandler(section, '/customformat/schema'),
+
+    [FETCH_CUSTOM_FORMAT_SPECIFICATIONS]: (getState, payload, dispatch) => {
+      let tags = [];
+      if (payload.id) {
+        const cfState = getSectionState(getState(), 'settings.customFormats', true);
+        const cf = cfState.items[cfState.itemMap[payload.id]];
+        tags = cf.specifications.map((tag, i) => {
+          return {
+            id: i + 1,
+            ...tag
+          };
+        });
+      }
+
+      dispatch(batchActions([
+        update({ section, data: tags }),
+        set({
+          section,
+          isPopulated: true
+        })
+      ]));
+    },
+
+    [SAVE_CUSTOM_FORMAT_SPECIFICATION]: (getState, payload, dispatch) => {
+      const {
+        id,
+        ...otherPayload
+      } = payload;
+
+      const saveData = getProviderState({ id, ...otherPayload }, getState, section, false);
+
+      // we have to set id since not actually posting to server yet
+      if (!saveData.id) {
+        saveData.id = getNextId(getState().settings.customFormatSpecifications.items);
+      }
+
+      dispatch(batchActions([
+        updateItem({ section, ...saveData }),
+        set({
+          section,
+          pendingChanges: {}
+        })
+      ]));
+    },
+
+    [DELETE_CUSTOM_FORMAT_SPECIFICATION]: (getState, payload, dispatch) => {
+      const id = payload.id;
+      return dispatch(removeItem({ section, id }));
+    },
+
+    [DELETE_ALL_CUSTOM_FORMAT_SPECIFICATION]: (getState, payload, dispatch) => {
+      return dispatch(set({
+        section,
+        items: []
+      }));
+    },
+
+    [CLEAR_CUSTOM_FORMAT_SPECIFICATION_PENDING]: (getState, payload, dispatch) => {
+      return dispatch(set({
+        section,
+        pendingChanges: {}
+      }));
+    }
+  },
+
+  //
+  // Reducers
+
+  reducers: {
+    [SET_CUSTOM_FORMAT_SPECIFICATION_VALUE]: createSetSettingValueReducer(section),
+    [SET_CUSTOM_FORMAT_SPECIFICATION_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
+
+    [SELECT_CUSTOM_FORMAT_SPECIFICATION_SCHEMA]: (state, { payload }) => {
+      return selectProviderSchema(state, section, payload, (selectedSchema) => {
+        return selectedSchema;
+      });
+    },
+
+    [CLONE_CUSTOM_FORMAT_SPECIFICATION]: function(state, { payload }) {
+      const id = payload.id;
+      const newState = getSectionState(state, section);
+      const items = newState.items;
+      const item = items.find((i) => i.id === id);
+      const newId = getNextId(newState.items);
+      const newItem = {
+        ...item,
+        id: newId,
+        name: `${item.name} - Copy`
+      };
+      newState.items = [...items, newItem];
+      newState.itemMap[newId] = newState.items.length - 1;
+
+      return updateSectionState(state, section, newState);
+    },
+
+    [CLEAR_CUSTOM_FORMAT_SPECIFICATIONS]: createClearReducer(section, {
+      isPopulated: false,
+      error: null,
+      items: []
+    })
+  }
+};
diff --git a/frontend/src/Store/Actions/Settings/customFormats.js b/frontend/src/Store/Actions/Settings/customFormats.js
new file mode 100644
index 000000000..4a175abea
--- /dev/null
+++ b/frontend/src/Store/Actions/Settings/customFormats.js
@@ -0,0 +1,108 @@
+import { createAction } from 'redux-actions';
+import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
+import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
+import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler';
+import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
+import { createThunk } from 'Store/thunks';
+import getSectionState from 'Utilities/State/getSectionState';
+import updateSectionState from 'Utilities/State/updateSectionState';
+import { set } from '../baseActions';
+
+//
+// Variables
+
+const section = 'settings.customFormats';
+
+//
+// Actions Types
+
+export const FETCH_CUSTOM_FORMATS = 'settings/customFormats/fetchCustomFormats';
+export const SAVE_CUSTOM_FORMAT = 'settings/customFormats/saveCustomFormat';
+export const DELETE_CUSTOM_FORMAT = 'settings/customFormats/deleteCustomFormat';
+export const SET_CUSTOM_FORMAT_VALUE = 'settings/customFormats/setCustomFormatValue';
+export const CLONE_CUSTOM_FORMAT = 'settings/customFormats/cloneCustomFormat';
+
+//
+// Action Creators
+
+export const fetchCustomFormats = createThunk(FETCH_CUSTOM_FORMATS);
+export const saveCustomFormat = createThunk(SAVE_CUSTOM_FORMAT);
+export const deleteCustomFormat = createThunk(DELETE_CUSTOM_FORMAT);
+
+export const setCustomFormatValue = createAction(SET_CUSTOM_FORMAT_VALUE, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
+export const cloneCustomFormat = createAction(CLONE_CUSTOM_FORMAT);
+
+//
+// Details
+
+export default {
+
+  //
+  // State
+
+  defaultState: {
+    isSchemaFetching: false,
+    isSchemaPopulated: false,
+    isFetching: false,
+    isPopulated: false,
+    schema: {
+      includeCustomFormatWhenRenaming: false
+    },
+    error: null,
+    isDeleting: false,
+    deleteError: null,
+    isSaving: false,
+    saveError: null,
+    items: [],
+    pendingChanges: {}
+  },
+
+  //
+  // Action Handlers
+
+  actionHandlers: {
+    [FETCH_CUSTOM_FORMATS]: createFetchHandler(section, '/customformat'),
+
+    [DELETE_CUSTOM_FORMAT]: createRemoveItemHandler(section, '/customformat'),
+
+    [SAVE_CUSTOM_FORMAT]: (getState, payload, dispatch) => {
+      // move the format tags in as a pending change
+      const state = getState();
+      const pendingChanges = state.settings.customFormats.pendingChanges;
+      pendingChanges.specifications = state.settings.customFormatSpecifications.items;
+      dispatch(set({
+        section,
+        pendingChanges
+      }));
+
+      createSaveProviderHandler(section, '/customformat')(getState, payload, dispatch);
+    }
+  },
+
+  //
+  // Reducers
+
+  reducers: {
+    [SET_CUSTOM_FORMAT_VALUE]: createSetSettingValueReducer(section),
+
+    [CLONE_CUSTOM_FORMAT]: function(state, { payload }) {
+      const id = payload.id;
+      const newState = getSectionState(state, section);
+      const item = newState.items.find((i) => i.id === id);
+      const pendingChanges = { ...item, id: 0 };
+      delete pendingChanges.id;
+
+      pendingChanges.name = `${pendingChanges.name} - Copy`;
+      newState.pendingChanges = pendingChanges;
+
+      return updateSectionState(state, section, newState);
+    }
+  }
+
+};
diff --git a/frontend/src/Store/Actions/blocklistActions.js b/frontend/src/Store/Actions/blocklistActions.js
index b529f10c6..06d870983 100644
--- a/frontend/src/Store/Actions/blocklistActions.js
+++ b/frontend/src/Store/Actions/blocklistActions.js
@@ -48,6 +48,12 @@ export const defaultState = {
       label: translate('Quality'),
       isVisible: true
     },
+    {
+      name: 'customFormats',
+      label: 'Formats',
+      isSortable: false,
+      isVisible: true
+    },
     {
       name: 'date',
       label: translate('Date'),
diff --git a/frontend/src/Store/Actions/historyActions.js b/frontend/src/Store/Actions/historyActions.js
index 7bfdb5843..86e4c984e 100644
--- a/frontend/src/Store/Actions/historyActions.js
+++ b/frontend/src/Store/Actions/historyActions.js
@@ -1,5 +1,7 @@
+import React from 'react';
 import { createAction } from 'redux-actions';
-import { filterTypes, sortDirections } from 'Helpers/Props';
+import Icon from 'Components/Icon';
+import { filterTypes, icons, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
@@ -56,6 +58,12 @@ export const defaultState = {
       label: translate('Quality'),
       isVisible: true
     },
+    {
+      name: 'customFormats',
+      label: 'Formats',
+      isSortable: false,
+      isVisible: true
+    },
     {
       name: 'date',
       label: translate('Date'),
@@ -82,6 +90,20 @@ export const defaultState = {
       label: translate('SourceTitle'),
       isVisible: false
     },
+    {
+      name: 'sourceTitle',
+      label: 'Source Title',
+      isVisible: false
+    },
+    {
+      name: 'customFormatScore',
+      columnLabel: 'Custom Format Score',
+      label: React.createElement(Icon, {
+        name: icons.SCORE,
+        title: 'Custom format score'
+      }),
+      isVisible: false
+    },
     {
       name: 'details',
       columnLabel: translate('Details'),
diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js
index 4449f24d4..8328ea079 100644
--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -87,6 +87,12 @@ export const defaultState = {
         isSortable: true,
         isVisible: true
       },
+      {
+        name: 'customFormats',
+        label: 'Formats',
+        isSortable: false,
+        isVisible: true
+      },
       {
         name: 'protocol',
         label: translate('Protocol'),
diff --git a/frontend/src/Store/Actions/releaseActions.js b/frontend/src/Store/Actions/releaseActions.js
index 582f6e361..c4729368a 100644
--- a/frontend/src/Store/Actions/releaseActions.js
+++ b/frontend/src/Store/Actions/releaseActions.js
@@ -197,6 +197,11 @@ export const defaultState = {
       type: filterBuilderTypes.EXACT,
       valueType: filterBuilderValueTypes.QUALITY
     },
+    {
+      name: 'customFormatScore',
+      label: translate('CustomFormatScore'),
+      type: filterBuilderTypes.NUMBER
+    },
     {
       name: 'rejectionCount',
       label: translate('RejectionCount'),
diff --git a/frontend/src/Store/Actions/settingsActions.js b/frontend/src/Store/Actions/settingsActions.js
index 3e28acaff..a8af15174 100644
--- a/frontend/src/Store/Actions/settingsActions.js
+++ b/frontend/src/Store/Actions/settingsActions.js
@@ -1,6 +1,8 @@
 import { createAction } from 'redux-actions';
 import { handleThunks } from 'Store/thunks';
 import createHandleActions from './Creators/createHandleActions';
+import customFormats from './Settings/customFormats';
+import customFormatSpecifications from './Settings/customFormatSpecifications';
 import delayProfiles from './Settings/delayProfiles';
 import downloadClientOptions from './Settings/downloadClientOptions';
 import downloadClients from './Settings/downloadClients';
@@ -24,6 +26,8 @@ import remotePathMappings from './Settings/remotePathMappings';
 import rootFolders from './Settings/rootFolders';
 import ui from './Settings/ui';
 
+export * from './Settings/customFormatSpecifications.js';
+export * from './Settings/customFormats';
 export * from './Settings/delayProfiles';
 export * from './Settings/downloadClients';
 export * from './Settings/downloadClientOptions';
@@ -58,6 +62,8 @@ export const section = 'settings';
 export const defaultState = {
   advancedSettings: false,
 
+  customFormatSpecifications: customFormatSpecifications.defaultState,
+  customFormats: customFormats.defaultState,
   delayProfiles: delayProfiles.defaultState,
   downloadClients: downloadClients.defaultState,
   downloadClientOptions: downloadClientOptions.defaultState,
@@ -100,6 +106,8 @@ export const toggleAdvancedSettings = createAction(TOGGLE_ADVANCED_SETTINGS);
 // Action Handlers
 
 export const actionHandlers = handleThunks({
+  ...customFormatSpecifications.actionHandlers,
+  ...customFormats.actionHandlers,
   ...delayProfiles.actionHandlers,
   ...downloadClients.actionHandlers,
   ...downloadClientOptions.actionHandlers,
@@ -133,6 +141,8 @@ export const reducers = createHandleActions({
     return Object.assign({}, state, { advancedSettings: !state.advancedSettings });
   },
 
+  ...customFormatSpecifications.reducers,
+  ...customFormats.reducers,
   ...delayProfiles.reducers,
   ...downloadClients.reducers,
   ...downloadClientOptions.reducers,
diff --git a/frontend/src/Utilities/Number/formatPreferredWordScore.js b/frontend/src/Utilities/Number/formatPreferredWordScore.js
new file mode 100644
index 000000000..5869f0052
--- /dev/null
+++ b/frontend/src/Utilities/Number/formatPreferredWordScore.js
@@ -0,0 +1,16 @@
+
+function formatPreferredWordScore(input, customFormatsLength = 0) {
+  const score = Number(input);
+
+  if (score > 0) {
+    return `+${score}`;
+  }
+
+  if (score < 0) {
+    return score;
+  }
+
+  return customFormatsLength > 0 ? '+0' : '';
+}
+
+export default formatPreferredWordScore;
diff --git a/frontend/src/Utilities/State/getNextId.js b/frontend/src/Utilities/State/getNextId.js
new file mode 100644
index 000000000..204aac95a
--- /dev/null
+++ b/frontend/src/Utilities/State/getNextId.js
@@ -0,0 +1,5 @@
+function getNextId(items) {
+  return items.reduce((id, x) => Math.max(id, x.id), 1) + 1;
+}
+
+export default getNextId;
diff --git a/frontend/src/Utilities/State/getProviderState.js b/frontend/src/Utilities/State/getProviderState.js
index 60923a646..4159905b8 100644
--- a/frontend/src/Utilities/State/getProviderState.js
+++ b/frontend/src/Utilities/State/getProviderState.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import getSectionState from 'Utilities/State/getSectionState';
 
-function getProviderState(payload, getState, section) {
+function getProviderState(payload, getState, section, keyValueOnly=true) {
   const {
     id,
     ...otherPayload
@@ -23,10 +23,17 @@ function getProviderState(payload, getState, section) {
         field.value;
 
       // Only send the name and value to the server
-      result.push({
-        name,
-        value
-      });
+      if (keyValueOnly) {
+        result.push({
+          name,
+          value
+        });
+      } else {
+        result.push({
+          ...field,
+          value
+        });
+      }
 
       return result;
     }, []);
diff --git a/package.json b/package.json
index d1ebbe695..9d9b8dcea 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "react-google-recaptcha": "2.1.0",
     "react-lazyload": "3.2.0",
     "react-measure": "1.4.7",
+    "react-middle-truncate": "1.0.3",
     "react-popper": "1.3.7",
     "react-redux": "7.2.4",
     "react-router": "5.2.0",
diff --git a/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs b/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs
index a924dba33..181645735 100644
--- a/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs
+++ b/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs
@@ -3,6 +3,7 @@ using Lidarr.Http.Extensions;
 using Lidarr.Http.REST.Attributes;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Blocklisting;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 
 namespace Lidarr.Api.V1.Blocklist
@@ -11,10 +12,13 @@ namespace Lidarr.Api.V1.Blocklist
     public class BlocklistController : Controller
     {
         private readonly IBlocklistService _blocklistService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
 
-        public BlocklistController(IBlocklistService blocklistService)
+        public BlocklistController(IBlocklistService blocklistService,
+                                   ICustomFormatCalculationService formatCalculator)
         {
             _blocklistService = blocklistService;
+            _formatCalculator = formatCalculator;
         }
 
         [HttpGet]
@@ -23,7 +27,7 @@ namespace Lidarr.Api.V1.Blocklist
             var pagingResource = Request.ReadPagingResourceFromRequest<BlocklistResource>();
             var pagingSpec = pagingResource.MapToPagingSpec<BlocklistResource, NzbDrone.Core.Blocklisting.Blocklist>("date", SortDirection.Descending);
 
-            return pagingSpec.ApplyToPage(_blocklistService.Paged, BlocklistResourceMapper.MapToResource);
+            return pagingSpec.ApplyToPage(_blocklistService.Paged, model => BlocklistResourceMapper.MapToResource(model, _formatCalculator));
         }
 
         [RestDeleteById]
diff --git a/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs b/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
index c81eb0075..ac906b701 100644
--- a/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
+++ b/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Lidarr.Api.V1.Artist;
+using Lidarr.Api.V1.CustomFormats;
 using Lidarr.Http.REST;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Qualities;
 
@@ -13,6 +15,7 @@ namespace Lidarr.Api.V1.Blocklist
         public List<int> AlbumIds { get; set; }
         public string SourceTitle { get; set; }
         public QualityModel Quality { get; set; }
+        public List<CustomFormatResource> CustomFormats { get; set; }
         public DateTime Date { get; set; }
         public DownloadProtocol Protocol { get; set; }
         public string Indexer { get; set; }
@@ -23,7 +26,7 @@ namespace Lidarr.Api.V1.Blocklist
 
     public static class BlocklistResourceMapper
     {
-        public static BlocklistResource MapToResource(this NzbDrone.Core.Blocklisting.Blocklist model)
+        public static BlocklistResource MapToResource(this NzbDrone.Core.Blocklisting.Blocklist model, ICustomFormatCalculationService formatCalculator)
         {
             if (model == null)
             {
@@ -38,6 +41,7 @@ namespace Lidarr.Api.V1.Blocklist
                 AlbumIds = model.AlbumIds,
                 SourceTitle = model.SourceTitle,
                 Quality = model.Quality,
+                CustomFormats = formatCalculator.ParseCustomFormat(model, model.Artist).ToResource(false),
                 Date = model.Date,
                 Protocol = model.Protocol,
                 Indexer = model.Indexer,
diff --git a/src/Lidarr.Api.V1/CustomFormats/CustomFormatController.cs b/src/Lidarr.Api.V1/CustomFormats/CustomFormatController.cs
new file mode 100644
index 000000000..c152ca115
--- /dev/null
+++ b/src/Lidarr.Api.V1/CustomFormats/CustomFormatController.cs
@@ -0,0 +1,115 @@
+using System.Collections.Generic;
+using System.Linq;
+using FluentValidation;
+using Lidarr.Api.V1.CustomFormats;
+using Lidarr.Http;
+using Lidarr.Http.REST;
+using Lidarr.Http.REST.Attributes;
+using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
+
+namespace Sonarr.Api.V3.CustomFormats
+{
+    [V1ApiController]
+    public class CustomFormatController : RestController<CustomFormatResource>
+    {
+        private readonly ICustomFormatService _formatService;
+        private readonly List<ICustomFormatSpecification> _specifications;
+
+        public CustomFormatController(ICustomFormatService formatService,
+                                  List<ICustomFormatSpecification> specifications)
+        {
+            _formatService = formatService;
+            _specifications = specifications;
+
+            SharedValidator.RuleFor(c => c.Name).NotEmpty();
+            SharedValidator.RuleFor(c => c.Name)
+                .Must((v, c) => !_formatService.All().Any(f => f.Name == c && f.Id != v.Id)).WithMessage("Must be unique.");
+            SharedValidator.RuleFor(c => c.Specifications).NotEmpty();
+            SharedValidator.RuleFor(c => c).Custom((customFormat, context) =>
+            {
+                if (!customFormat.Specifications.Any())
+                {
+                    context.AddFailure("Must contain at least one Condition");
+                }
+
+                if (customFormat.Specifications.Any(s => s.Name.IsNullOrWhiteSpace()))
+                {
+                    context.AddFailure("Condition name(s) cannot be empty or consist of only spaces");
+                }
+            });
+        }
+
+        public override CustomFormatResource GetResourceById(int id)
+        {
+            return _formatService.GetById(id).ToResource(true);
+        }
+
+        [RestPostById]
+        [Consumes("application/json")]
+        public ActionResult<CustomFormatResource> Create(CustomFormatResource customFormatResource)
+        {
+            var model = customFormatResource.ToModel(_specifications);
+            return Created(_formatService.Insert(model).Id);
+        }
+
+        [RestPutById]
+        [Consumes("application/json")]
+        public ActionResult<CustomFormatResource> Update(CustomFormatResource resource)
+        {
+            var model = resource.ToModel(_specifications);
+            _formatService.Update(model);
+
+            return Accepted(model.Id);
+        }
+
+        [HttpGet]
+        [Produces("application/json")]
+        public List<CustomFormatResource> GetAll()
+        {
+            return _formatService.All().ToResource(true);
+        }
+
+        [RestDeleteById]
+        public void DeleteFormat(int id)
+        {
+            _formatService.Delete(id);
+        }
+
+        [HttpGet("schema")]
+        public object GetTemplates()
+        {
+            var schema = _specifications.OrderBy(x => x.Order).Select(x => x.ToSchema()).ToList();
+
+            var presets = GetPresets();
+
+            foreach (var item in schema)
+            {
+                item.Presets = presets.Where(x => x.GetType().Name == item.Implementation).Select(x => x.ToSchema()).ToList();
+            }
+
+            return schema;
+        }
+
+        private IEnumerable<ICustomFormatSpecification> GetPresets()
+        {
+            yield return new ReleaseTitleSpecification
+            {
+                Name = "Preferred Words",
+                Value = @"\b(SPARKS|Framestor)\b"
+            };
+
+            var formats = _formatService.All();
+            foreach (var format in formats)
+            {
+                foreach (var condition in format.Specifications)
+                {
+                    var preset = condition.Clone();
+                    preset.Name = $"{format.Name}: {preset.Name}";
+                    yield return preset;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/CustomFormats/CustomFormatResource.cs b/src/Lidarr.Api.V1/CustomFormats/CustomFormatResource.cs
new file mode 100644
index 000000000..c5f5dbee8
--- /dev/null
+++ b/src/Lidarr.Api.V1/CustomFormats/CustomFormatResource.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using Lidarr.Http.ClientSchema;
+using Lidarr.Http.REST;
+using NzbDrone.Core.CustomFormats;
+
+namespace Lidarr.Api.V1.CustomFormats
+{
+    public class CustomFormatResource : RestResource
+    {
+        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+        public override int Id { get; set; }
+        public string Name { get; set; }
+        public bool? IncludeCustomFormatWhenRenaming { get; set; }
+        public List<CustomFormatSpecificationSchema> Specifications { get; set; }
+    }
+
+    public static class CustomFormatResourceMapper
+    {
+        public static CustomFormatResource ToResource(this CustomFormat model, bool includeDetails)
+        {
+            var resource = new CustomFormatResource
+            {
+                Id = model.Id,
+                Name = model.Name
+            };
+
+            if (includeDetails)
+            {
+                resource.IncludeCustomFormatWhenRenaming = model.IncludeCustomFormatWhenRenaming;
+                resource.Specifications = model.Specifications.Select(x => x.ToSchema()).ToList();
+            }
+
+            return resource;
+        }
+
+        public static List<CustomFormatResource> ToResource(this IEnumerable<CustomFormat> models, bool includeDetails)
+        {
+            return models.Select(m => m.ToResource(includeDetails)).ToList();
+        }
+
+        public static CustomFormat ToModel(this CustomFormatResource resource, List<ICustomFormatSpecification> specifications)
+        {
+            return new CustomFormat
+            {
+                Id = resource.Id,
+                Name = resource.Name,
+                IncludeCustomFormatWhenRenaming = resource.IncludeCustomFormatWhenRenaming ?? false,
+                Specifications = resource.Specifications?.Select(x => MapSpecification(x, specifications)).ToList() ?? new List<ICustomFormatSpecification>()
+            };
+        }
+
+        private static ICustomFormatSpecification MapSpecification(CustomFormatSpecificationSchema resource, List<ICustomFormatSpecification> specifications)
+        {
+            var matchingSpec =
+                specifications.SingleOrDefault(x => x.GetType().Name == resource.Implementation);
+
+            if (matchingSpec is null)
+            {
+                throw new ArgumentException(
+                    $"{resource.Implementation} is not a valid specification implementation");
+            }
+
+            var type = matchingSpec.GetType();
+
+            var spec = (ICustomFormatSpecification)SchemaBuilder.ReadFromSchema(resource.Fields, type);
+            spec.Name = resource.Name;
+            spec.Negate = resource.Negate;
+            spec.Required = resource.Required;
+            return spec;
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/CustomFormats/CustomFormatSpecificationSchema.cs b/src/Lidarr.Api.V1/CustomFormats/CustomFormatSpecificationSchema.cs
new file mode 100644
index 000000000..8400f34c1
--- /dev/null
+++ b/src/Lidarr.Api.V1/CustomFormats/CustomFormatSpecificationSchema.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using Lidarr.Http.ClientSchema;
+using Lidarr.Http.REST;
+using NzbDrone.Core.CustomFormats;
+
+namespace Lidarr.Api.V1.CustomFormats
+{
+    public class CustomFormatSpecificationSchema : RestResource
+    {
+        public string Name { get; set; }
+        public string Implementation { get; set; }
+        public string ImplementationName { get; set; }
+        public string InfoLink { get; set; }
+        public bool Negate { get; set; }
+        public bool Required { get; set; }
+        public List<Field> Fields { get; set; }
+        public List<CustomFormatSpecificationSchema> Presets { get; set; }
+    }
+
+    public static class CustomFormatSpecificationSchemaMapper
+    {
+        public static CustomFormatSpecificationSchema ToSchema(this ICustomFormatSpecification model)
+        {
+            return new CustomFormatSpecificationSchema
+            {
+                Name = model.Name,
+                Implementation = model.GetType().Name,
+                ImplementationName = model.ImplementationName,
+                InfoLink = model.InfoLink,
+                Negate = model.Negate,
+                Required = model.Required,
+                Fields = SchemaBuilder.ToSchema(model)
+            };
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/History/HistoryController.cs b/src/Lidarr.Api.V1/History/HistoryController.cs
index a87d1d8d7..ecc41b7d7 100644
--- a/src/Lidarr.Api.V1/History/HistoryController.cs
+++ b/src/Lidarr.Api.V1/History/HistoryController.cs
@@ -7,6 +7,7 @@ using Lidarr.Api.V1.Tracks;
 using Lidarr.Http;
 using Lidarr.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Download;
@@ -18,21 +19,24 @@ namespace Lidarr.Api.V1.History
     public class HistoryController : Controller
     {
         private readonly IHistoryService _historyService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly IUpgradableSpecification _upgradableSpecification;
         private readonly IFailedDownloadService _failedDownloadService;
 
         public HistoryController(IHistoryService historyService,
+                             ICustomFormatCalculationService formatCalculator,
                              IUpgradableSpecification upgradableSpecification,
                              IFailedDownloadService failedDownloadService)
         {
             _historyService = historyService;
+            _formatCalculator = formatCalculator;
             _upgradableSpecification = upgradableSpecification;
             _failedDownloadService = failedDownloadService;
         }
 
         protected HistoryResource MapToResource(EntityHistory model, bool includeArtist, bool includeAlbum, bool includeTrack)
         {
-            var resource = model.ToResource();
+            var resource = model.ToResource(_formatCalculator);
 
             if (includeArtist)
             {
diff --git a/src/Lidarr.Api.V1/History/HistoryResource.cs b/src/Lidarr.Api.V1/History/HistoryResource.cs
index c34ad98e7..2b59e9b9f 100644
--- a/src/Lidarr.Api.V1/History/HistoryResource.cs
+++ b/src/Lidarr.Api.V1/History/HistoryResource.cs
@@ -2,8 +2,10 @@ using System;
 using System.Collections.Generic;
 using Lidarr.Api.V1.Albums;
 using Lidarr.Api.V1.Artist;
+using Lidarr.Api.V1.CustomFormats;
 using Lidarr.Api.V1.Tracks;
 using Lidarr.Http.REST;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Qualities;
 
@@ -16,6 +18,7 @@ namespace Lidarr.Api.V1.History
         public int TrackId { get; set; }
         public string SourceTitle { get; set; }
         public QualityModel Quality { get; set; }
+        public List<CustomFormatResource> CustomFormats { get; set; }
         public bool QualityCutoffNotMet { get; set; }
         public DateTime Date { get; set; }
         public string DownloadId { get; set; }
@@ -31,7 +34,7 @@ namespace Lidarr.Api.V1.History
 
     public static class HistoryResourceMapper
     {
-        public static HistoryResource ToResource(this EntityHistory model)
+        public static HistoryResource ToResource(this EntityHistory model, ICustomFormatCalculationService formatCalculator)
         {
             if (model == null)
             {
@@ -47,6 +50,7 @@ namespace Lidarr.Api.V1.History
                 TrackId = model.TrackId,
                 SourceTitle = model.SourceTitle,
                 Quality = model.Quality,
+                CustomFormats = formatCalculator.ParseCustomFormat(model, model.Artist).ToResource(false),
 
                 // QualityCutoffNotMet
                 Date = model.Date,
diff --git a/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs
index d9a17c4b1..ca9acd4d1 100644
--- a/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs
+++ b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
+using Lidarr.Api.V1.CustomFormats;
 using Lidarr.Http.REST;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Indexers;
@@ -40,7 +41,8 @@ namespace Lidarr.Api.V1.Indexers
         public string InfoUrl { get; set; }
         public bool DownloadAllowed { get; set; }
         public int ReleaseWeight { get; set; }
-        public int PreferredWordScore { get; set; }
+        public List<CustomFormatResource> CustomFormats { get; set; }
+        public int CustomFormatScore { get; set; }
 
         public string MagnetUrl { get; set; }
         public string InfoHash { get; set; }
@@ -99,7 +101,8 @@ namespace Lidarr.Api.V1.Indexers
                 DownloadAllowed = remoteAlbum.DownloadAllowed,
 
                 // ReleaseWeight
-                PreferredWordScore = remoteAlbum.PreferredWordScore,
+                CustomFormatScore = remoteAlbum.CustomFormatScore,
+                CustomFormats = remoteAlbum.CustomFormats.ToResource(false),
 
                 MagnetUrl = torrentInfo.MagnetUrl,
                 InfoHash = torrentInfo.InfoHash,
diff --git a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs
index 23c483c21..1e5c7f1da 100644
--- a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs
+++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Lidarr.Http.REST;
 using NzbDrone.Core.Indexers;
@@ -13,6 +13,9 @@ namespace Lidarr.Api.V1.Profiles.Delay
         public DownloadProtocol PreferredProtocol { get; set; }
         public int UsenetDelay { get; set; }
         public int TorrentDelay { get; set; }
+        public bool BypassIfHighestQuality { get; set; }
+        public bool BypassIfAboveCustomFormatScore { get; set; }
+        public int MinimumCustomFormatScore { get; set; }
         public int Order { get; set; }
         public HashSet<int> Tags { get; set; }
     }
@@ -35,6 +38,9 @@ namespace Lidarr.Api.V1.Profiles.Delay
                 PreferredProtocol = model.PreferredProtocol,
                 UsenetDelay = model.UsenetDelay,
                 TorrentDelay = model.TorrentDelay,
+                BypassIfHighestQuality = model.BypassIfHighestQuality,
+                BypassIfAboveCustomFormatScore = model.BypassIfAboveCustomFormatScore,
+                MinimumCustomFormatScore = model.MinimumCustomFormatScore,
                 Order = model.Order,
                 Tags = new HashSet<int>(model.Tags)
             };
@@ -56,6 +62,9 @@ namespace Lidarr.Api.V1.Profiles.Delay
                 PreferredProtocol = resource.PreferredProtocol,
                 UsenetDelay = resource.UsenetDelay,
                 TorrentDelay = resource.TorrentDelay,
+                BypassIfHighestQuality = resource.BypassIfHighestQuality,
+                BypassIfAboveCustomFormatScore = resource.BypassIfAboveCustomFormatScore,
+                MinimumCustomFormatScore = resource.MinimumCustomFormatScore,
                 Order = resource.Order,
                 Tags = new HashSet<int>(resource.Tags)
             };
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileController.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileController.cs
index 3f2bcb016..c9e936112 100644
--- a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileController.cs
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileController.cs
@@ -1,9 +1,12 @@
 using System.Collections.Generic;
+using System.Linq;
 using FluentValidation;
 using Lidarr.Http;
 using Lidarr.Http.REST;
 using Lidarr.Http.REST.Attributes;
 using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Profiles.Qualities;
 
 namespace Lidarr.Api.V1.Profiles.Quality
@@ -12,13 +15,30 @@ namespace Lidarr.Api.V1.Profiles.Quality
     public class QualityProfileController : RestController<QualityProfileResource>
     {
         private readonly IQualityProfileService _qualityProfileService;
+        private readonly ICustomFormatService _formatService;
 
-        public QualityProfileController(IQualityProfileService qualityProfileService)
+        public QualityProfileController(IQualityProfileService qualityProfileService, ICustomFormatService formatService)
         {
             _qualityProfileService = qualityProfileService;
+            _formatService = formatService;
             SharedValidator.RuleFor(c => c.Name).NotEmpty();
             SharedValidator.RuleFor(c => c.Cutoff).ValidCutoff();
             SharedValidator.RuleFor(c => c.Items).ValidItems();
+            SharedValidator.RuleFor(c => c.FormatItems).Must(items =>
+            {
+                var all = _formatService.All().Select(f => f.Id).ToList();
+                var ids = items.Select(i => i.Format);
+
+                return all.Except(ids).Empty();
+            }).WithMessage("All Custom Formats and no extra ones need to be present inside your Profile! Try refreshing your browser.");
+            SharedValidator.RuleFor(c => c).Custom((profile, context) =>
+            {
+                if (profile.FormatItems.Where(x => x.Score > 0).Sum(x => x.Score) < profile.MinFormatScore &&
+                    profile.FormatItems.Max(x => x.Score) < profile.MinFormatScore)
+                {
+                    context.AddFailure("Minimum Custom Format Score can never be satisfied");
+                }
+            });
         }
 
         [RestPostById]
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs
index 381bb17c7..5962278bd 100644
--- a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Lidarr.Http.REST;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Profiles.Qualities;
 
 namespace Lidarr.Api.V1.Profiles.Quality
@@ -11,6 +13,9 @@ namespace Lidarr.Api.V1.Profiles.Quality
         public bool UpgradeAllowed { get; set; }
         public int Cutoff { get; set; }
         public List<QualityProfileQualityItemResource> Items { get; set; }
+        public int MinFormatScore { get; set; }
+        public int CutoffFormatScore { get; set; }
+        public List<ProfileFormatItemResource> FormatItems { get; set; }
     }
 
     public class QualityProfileQualityItemResource : RestResource
@@ -26,6 +31,13 @@ namespace Lidarr.Api.V1.Profiles.Quality
         }
     }
 
+    public class ProfileFormatItemResource : RestResource
+    {
+        public int Format { get; set; }
+        public string Name { get; set; }
+        public int Score { get; set; }
+    }
+
     public static class ProfileResourceMapper
     {
         public static QualityProfileResource ToResource(this QualityProfile model)
@@ -41,7 +53,10 @@ namespace Lidarr.Api.V1.Profiles.Quality
                 Name = model.Name,
                 UpgradeAllowed = model.UpgradeAllowed,
                 Cutoff = model.Cutoff,
-                Items = model.Items.ConvertAll(ToResource)
+                Items = model.Items.ConvertAll(ToResource),
+                MinFormatScore = model.MinFormatScore,
+                CutoffFormatScore = model.CutoffFormatScore,
+                FormatItems = model.FormatItems.ConvertAll(ToResource)
             };
         }
 
@@ -62,6 +77,16 @@ namespace Lidarr.Api.V1.Profiles.Quality
             };
         }
 
+        public static ProfileFormatItemResource ToResource(this ProfileFormatItem model)
+        {
+            return new ProfileFormatItemResource
+            {
+                Format = model.Format.Id,
+                Name = model.Format.Name,
+                Score = model.Score
+            };
+        }
+
         public static QualityProfile ToModel(this QualityProfileResource resource)
         {
             if (resource == null)
@@ -75,7 +100,10 @@ namespace Lidarr.Api.V1.Profiles.Quality
                 Name = resource.Name,
                 UpgradeAllowed = resource.UpgradeAllowed,
                 Cutoff = resource.Cutoff,
-                Items = resource.Items.ConvertAll(ToModel)
+                Items = resource.Items.ConvertAll(ToModel),
+                MinFormatScore = resource.MinFormatScore,
+                CutoffFormatScore = resource.CutoffFormatScore,
+                FormatItems = resource.FormatItems.ConvertAll(ToModel)
             };
         }
 
@@ -96,6 +124,15 @@ namespace Lidarr.Api.V1.Profiles.Quality
             };
         }
 
+        public static ProfileFormatItem ToModel(this ProfileFormatItemResource resource)
+        {
+            return new ProfileFormatItem
+            {
+                Format = new CustomFormat { Id = resource.Format },
+                Score = resource.Score
+            };
+        }
+
         public static List<QualityProfileResource> ToResource(this IEnumerable<QualityProfile> models)
         {
             return models.Select(ToResource).ToList();
diff --git a/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileController.cs b/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileController.cs
index 5cc4810d3..192b51d49 100644
--- a/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileController.cs
+++ b/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileController.cs
@@ -24,7 +24,7 @@ namespace Lidarr.Api.V1.Profiles.Release
 
             SharedValidator.RuleFor(r => r).Custom((restriction, context) =>
             {
-                if (restriction.Ignored.IsNullOrWhiteSpace() && restriction.Required.IsNullOrWhiteSpace() && restriction.Preferred.Empty())
+                if (restriction.Ignored.Empty() && restriction.Required.Empty())
                 {
                     context.AddFailure("Either 'Must contain' or 'Must not contain' is required");
                 }
@@ -33,11 +33,6 @@ namespace Lidarr.Api.V1.Profiles.Release
                 {
                     context.AddFailure(nameof(ReleaseProfile.IndexerId), "Indexer does not exist");
                 }
-
-                if (restriction.Preferred.Any(p => p.Key.IsNullOrWhiteSpace()))
-                {
-                    context.AddFailure("Preferred", "Term cannot be empty or consist of only spaces");
-                }
             });
         }
 
diff --git a/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileResource.cs
index 203186fa5..b2c7d68cc 100644
--- a/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileResource.cs
+++ b/src/Lidarr.Api.V1/Profiles/Release/ReleaseProfileResource.cs
@@ -8,10 +8,8 @@ namespace Lidarr.Api.V1.Profiles.Release
     public class ReleaseProfileResource : RestResource
     {
         public bool Enabled { get; set; }
-        public string Required { get; set; }
-        public string Ignored { get; set; }
-        public List<KeyValuePair<string, int>> Preferred { get; set; }
-        public bool IncludePreferredWhenRenaming { get; set; }
+        public List<string> Required { get; set; }
+        public List<string> Ignored { get; set; }
         public int IndexerId { get; set; }
         public HashSet<int> Tags { get; set; }
 
@@ -37,8 +35,6 @@ namespace Lidarr.Api.V1.Profiles.Release
                 Enabled = model.Enabled,
                 Required = model.Required,
                 Ignored = model.Ignored,
-                Preferred = model.Preferred,
-                IncludePreferredWhenRenaming = model.IncludePreferredWhenRenaming,
                 IndexerId = model.IndexerId,
                 Tags = new HashSet<int>(model.Tags)
             };
@@ -58,8 +54,6 @@ namespace Lidarr.Api.V1.Profiles.Release
                 Enabled = resource.Enabled,
                 Required = resource.Required,
                 Ignored = resource.Ignored,
-                Preferred = resource.Preferred,
-                IncludePreferredWhenRenaming = resource.IncludePreferredWhenRenaming,
                 IndexerId = resource.IndexerId,
                 Tags = new HashSet<int>(resource.Tags)
             };
diff --git a/src/Lidarr.Api.V1/Queue/QueueResource.cs b/src/Lidarr.Api.V1/Queue/QueueResource.cs
index c34403642..6748cf474 100644
--- a/src/Lidarr.Api.V1/Queue/QueueResource.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueResource.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Lidarr.Api.V1.Albums;
 using Lidarr.Api.V1.Artist;
+using Lidarr.Api.V1.CustomFormats;
 using Lidarr.Http.REST;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Download.TrackedDownloads;
@@ -18,6 +19,7 @@ namespace Lidarr.Api.V1.Queue
         public ArtistResource Artist { get; set; }
         public AlbumResource Album { get; set; }
         public QualityModel Quality { get; set; }
+        public List<CustomFormatResource> CustomFormats { get; set; }
         public decimal Size { get; set; }
         public string Title { get; set; }
         public decimal Sizeleft { get; set; }
@@ -53,6 +55,7 @@ namespace Lidarr.Api.V1.Queue
                 Artist = includeArtist && model.Artist != null ? model.Artist.ToResource() : null,
                 Album = includeAlbum && model.Album != null ? model.Album.ToResource() : null,
                 Quality = model.Quality,
+                CustomFormats = model.RemoteAlbum?.CustomFormats?.ToResource(false),
                 Size = model.Size,
                 Title = model.Title,
                 Sizeleft = model.Sizeleft,
diff --git a/src/Lidarr.Http/ClientSchema/Field.cs b/src/Lidarr.Http/ClientSchema/Field.cs
index 601aa8b3e..1028c8eff 100644
--- a/src/Lidarr.Http/ClientSchema/Field.cs
+++ b/src/Lidarr.Http/ClientSchema/Field.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using NzbDrone.Core.Annotations;
 
 namespace Lidarr.Http.ClientSchema
 {
diff --git a/src/Lidarr.Http/REST/RestResource.cs b/src/Lidarr.Http/REST/RestResource.cs
index 4774d10a5..827cd2bc5 100644
--- a/src/Lidarr.Http/REST/RestResource.cs
+++ b/src/Lidarr.Http/REST/RestResource.cs
@@ -5,7 +5,7 @@ namespace Lidarr.Http.REST
     public abstract class RestResource
     {
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
-        public int Id { get; set; }
+        public virtual int Id { get; set; }
 
         [JsonIgnore]
         public virtual string ResourceName => GetType().Name.ToLowerInvariant().Replace("resource", "");
diff --git a/src/NzbDrone.Core.Test/CustomFormats/CustomFormatsTestHelpers.cs b/src/NzbDrone.Core.Test/CustomFormats/CustomFormatsTestHelpers.cs
new file mode 100644
index 000000000..a384a2b8e
--- /dev/null
+++ b/src/NzbDrone.Core.Test/CustomFormats/CustomFormatsTestHelpers.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.CustomFormats
+{
+    public class CustomFormatsTestHelpers : CoreTest
+    {
+        private static List<CustomFormat> _customFormats { get; set; }
+
+        public static void GivenCustomFormats(params CustomFormat[] formats)
+        {
+            _customFormats = formats.ToList();
+        }
+
+        public static List<ProfileFormatItem> GetSampleFormatItems(params string[] allowed)
+        {
+            var allowedItems = _customFormats.Where(x => allowed.Contains(x.Name)).Select((f, index) => new ProfileFormatItem { Format = f, Score = (int)Math.Pow(2, index) }).ToList();
+            var disallowedItems = _customFormats.Where(x => !allowed.Contains(x.Name)).Select(f => new ProfileFormatItem { Format = f, Score = -1 * (int)Math.Pow(2, allowedItems.Count) });
+
+            return disallowedItems.Concat(allowedItems).ToList();
+        }
+
+        public static List<ProfileFormatItem> GetDefaultFormatItems()
+        {
+            return new List<ProfileFormatItem>();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/063_add_custom_formatsFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/063_add_custom_formatsFixture.cs
new file mode 100644
index 000000000..5aa64f766
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/063_add_custom_formatsFixture.cs
@@ -0,0 +1,431 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Migration
+{
+    [TestFixture]
+    public class add_custom_formatsFixture : MigrationTest<add_custom_formats>
+    {
+        [Test]
+        public void should_add_cf_from_named_release_profile()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var customFormats = db.Query<CustomFormat171>("SELECT \"Id\", \"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\" FROM \"CustomFormats\"");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().Name.Should().Be("Unnamed_1");
+            customFormats.First().IncludeCustomFormatWhenRenaming.Should().BeFalse();
+            customFormats.First().Specifications.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_not_migrate_if_bad_regex_in_release_profile()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "[somestring[",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = true,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var customFormats = db.Query<CustomFormat171>("SELECT \"Id\", \"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\" FROM \"CustomFormats\"");
+
+            customFormats.Should().HaveCount(0);
+        }
+
+        [Test]
+        public void should_set_cf_naming_token_if_set_in_release_profile()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = true,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var customFormats = db.Query<CustomFormat171>("SELECT \"Id\", \"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\" FROM \"CustomFormats\"");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().Name.Should().Be("Unnamed_1");
+            customFormats.First().IncludeCustomFormatWhenRenaming.Should().BeTrue();
+            customFormats.First().Specifications.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_not_remove_release_profile_if_ignored_or_required()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "some",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = true,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var releaseProfiles = db.Query<ReleaseProfile171>("SELECT \"Id\" FROM \"ReleaseProfiles\"");
+
+            releaseProfiles.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_remove_release_profile_if_no_ignored_or_required()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = true,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var releaseProfiles = db.Query<ReleaseProfile171>("SELECT \"Id\" FROM \"ReleaseProfiles\"");
+
+            releaseProfiles.Should().HaveCount(0);
+        }
+
+        [Test]
+        public void should_add_cf_from_unnamed_release_profile()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var customFormats = db.Query<CustomFormat171>("SELECT \"Id\", \"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\" FROM \"CustomFormats\"");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().Name.Should().Be("Unnamed_1");
+            customFormats.First().IncludeCustomFormatWhenRenaming.Should().BeFalse();
+            customFormats.First().Specifications.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_add_cfs_from_multiple_unnamed_release_profile()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x265",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var customFormats = db.Query<CustomFormat171>("SELECT \"Id\", \"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\" FROM \"CustomFormats\"");
+
+            customFormats.Should().HaveCount(2);
+            customFormats.First().Name.Should().Be("Unnamed_1");
+            customFormats.Last().Name.Should().Be("Unnamed_2");
+            customFormats.First().IncludeCustomFormatWhenRenaming.Should().BeFalse();
+            customFormats.First().Specifications.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_add_two_cfs_if_release_profile_has_multiple_terms()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        },
+                        new
+                        {
+                            Key = "x265",
+                            Value = 5
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var customFormats = db.Query<CustomFormat171>("SELECT \"Id\", \"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\" FROM \"CustomFormats\"");
+
+            customFormats.Should().HaveCount(2);
+            customFormats.First().Name.Should().Be("Unnamed_1_0");
+            customFormats.Last().Name.Should().Be("Unnamed_1_1");
+            customFormats.First().IncludeCustomFormatWhenRenaming.Should().BeFalse();
+            customFormats.First().Specifications.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_set_scores_for_enabled_release_profiles()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+
+                c.Insert.IntoTable("QualityProfiles").Row(new
+                {
+                    Name = "SDTV",
+                    Cutoff = 1,
+                    Items = "[ { \"quality\": 1, \"allowed\": true } ]"
+                });
+            });
+
+            var customFormats = db.Query<QualityProfile171>("SELECT \"Id\", \"Name\", \"FormatItems\" FROM \"QualityProfiles\"");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().FormatItems.Should().HaveCount(1);
+            customFormats.First().FormatItems.First().Score.Should().Be(2);
+        }
+
+        [Test]
+        public void should_set_zero_scores_for_disabled_release_profiles()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "",
+                    Ignored = "",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = false,
+                    IndexerId = 0
+                });
+
+                c.Insert.IntoTable("QualityProfiles").Row(new
+                {
+                    Name = "SDTV",
+                    Cutoff = 1,
+                    Items = "[ { \"quality\": 1, \"allowed\": true } ]"
+                });
+            });
+
+            var customFormats = db.Query<QualityProfile171>("SELECT \"Id\", \"Name\", \"FormatItems\" FROM \"QualityProfiles\"");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().FormatItems.Should().HaveCount(1);
+            customFormats.First().FormatItems.First().Score.Should().Be(0);
+        }
+
+        [Test]
+        public void should_migrate_naming_configs()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("NamingConfig").Row(new
+                {
+                    ReplaceIllegalCharacters = false,
+                    StandardTrackFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Preferred Words } {Quality Full}",
+                    MultiDiscTrackFormat = "{Series Title} - {Air-Date} - {Episode Title} {Preferred.Words } {Quality Full}",
+                });
+            });
+
+            var customFormats = db.Query<NamingConfig171>("SELECT \"StandardTrackFormat\", \"MultiDiscTrackFormat\" FROM \"NamingConfig\"");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().StandardTrackFormat.Should().Be("{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Custom Formats } {Quality Full}");
+            customFormats.First().MultiDiscTrackFormat.Should().Be("{Series Title} - {Air-Date} - {Episode Title} {Custom.Formats } {Quality Full}");
+        }
+
+        private class NamingConfig171
+        {
+            public string StandardTrackFormat { get; set; }
+            public string MultiDiscTrackFormat { get; set; }
+        }
+
+        private class ReleaseProfile171
+        {
+            public int Id { get; set; }
+        }
+
+        private class QualityProfile171
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+            public List<FormatItem171> FormatItems { get; set; }
+        }
+
+        private class FormatItem171
+        {
+            public int Format { get; set; }
+            public int Score { get; set; }
+        }
+
+        private class CustomFormat171
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+            public bool IncludeCustomFormatWhenRenaming { get; set; }
+            public List<CustomFormatSpec171> Specifications { get; set; }
+        }
+
+        private class CustomFormatSpec171
+        {
+            public string Type { get; set; }
+            public CustomFormatReleaseTitleSpec171 Body { get; set; }
+        }
+
+        private class CustomFormatReleaseTitleSpec171
+        {
+            public int Order { get; set; }
+            public string ImplementationName { get; set; }
+            public string Name { get; set; }
+            public string Value { get; set; }
+            public bool Required { get; set; }
+            public bool Negate { get; set; }
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/CustomFormatAllowedByProfileSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/CustomFormatAllowedByProfileSpecificationFixture.cs
new file mode 100644
index 000000000..0d692bc20
--- /dev/null
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/CustomFormatAllowedByProfileSpecificationFixture.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Profiles.Qualities;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests
+{
+    [TestFixture]
+
+    public class CustomFormatAllowedByProfileSpecificationFixture : CoreTest<CustomFormatAllowedbyProfileSpecification>
+    {
+        private RemoteAlbum _remoteAlbum;
+
+        private CustomFormat _format1;
+        private CustomFormat _format2;
+
+        [SetUp]
+        public void Setup()
+        {
+            _format1 = new CustomFormat("Awesome Format");
+            _format1.Id = 1;
+
+            _format2 = new CustomFormat("Cool Format");
+            _format2.Id = 2;
+
+            var fakeArtist = Builder<Artist>.CreateNew()
+                .With(c => c.QualityProfile = new QualityProfile
+                {
+                    Cutoff = Quality.MP3_320.Id,
+                    MinFormatScore = 1
+                })
+                .Build();
+
+            _remoteAlbum = new RemoteAlbum
+            {
+                Artist = fakeArtist,
+                ParsedAlbumInfo = new ParsedAlbumInfo { Quality = new QualityModel(Quality.MP3_016, new Revision(version: 2)) },
+            };
+
+            CustomFormatsTestHelpers.GivenCustomFormats(_format1, _format2);
+        }
+
+        [Test]
+        public void should_allow_if_format_score_greater_than_min()
+        {
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { _format1 };
+            _remoteAlbum.Artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name);
+            _remoteAlbum.CustomFormatScore = _remoteAlbum.Artist.QualityProfile.Value.CalculateCustomFormatScore(_remoteAlbum.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_deny_if_format_score_not_greater_than_min()
+        {
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { _format2 };
+            _remoteAlbum.Artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name);
+            _remoteAlbum.CustomFormatScore = _remoteAlbum.Artist.QualityProfile.Value.CalculateCustomFormatScore(_remoteAlbum.CustomFormats);
+
+            Console.WriteLine(_remoteAlbum.CustomFormatScore);
+            Console.WriteLine(_remoteAlbum.Artist.QualityProfile.Value.MinFormatScore);
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_deny_if_format_score_not_greater_than_min_2()
+        {
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { _format2, _format1 };
+            _remoteAlbum.Artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name);
+            _remoteAlbum.CustomFormatScore = _remoteAlbum.Artist.QualityProfile.Value.CalculateCustomFormatScore(_remoteAlbum.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_allow_if_all_format_is_defined_in_profile()
+        {
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { _format2, _format1 };
+            _remoteAlbum.Artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteAlbum.CustomFormatScore = _remoteAlbum.Artist.QualityProfile.Value.CalculateCustomFormatScore(_remoteAlbum.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_deny_if_no_format_was_parsed_and_min_score_positive()
+        {
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { };
+            _remoteAlbum.Artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteAlbum.CustomFormatScore = _remoteAlbum.Artist.QualityProfile.Value.CalculateCustomFormatScore(_remoteAlbum.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_allow_if_no_format_was_parsed_min_score_is_zero()
+        {
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { };
+            _remoteAlbum.Artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteAlbum.Artist.QualityProfile.Value.MinFormatScore = 0;
+            _remoteAlbum.CustomFormatScore = _remoteAlbum.Artist.QualityProfile.Value.CalculateCustomFormatScore(_remoteAlbum.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
index a616b2d97..23761abc3 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
@@ -11,8 +12,6 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
     [TestFixture]
     public class CutoffSpecificationFixture : CoreTest<UpgradableSpecification>
     {
-        private static readonly int NoPreferredWordScore = 0;
-
         [Test]
         public void should_return_true_if_current_album_is_less_than_cutoff()
         {
@@ -23,7 +22,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                  Items = Qualities.QualityFixture.GetDefaultQualities()
              },
              new List<QualityModel> { new QualityModel(Quality.MP3_192, new Revision(version: 2)) },
-             NoPreferredWordScore).Should().BeTrue();
+             new List<CustomFormat>()).Should().BeTrue();
         }
 
         [Test]
@@ -36,7 +35,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new List<QualityModel> { new QualityModel(Quality.MP3_256, new Revision(version: 2)) },
-            NoPreferredWordScore).Should().BeFalse();
+            new List<CustomFormat>()).Should().BeFalse();
         }
 
         [Test]
@@ -49,7 +48,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new List<QualityModel> { new QualityModel(Quality.MP3_320, new Revision(version: 2)) },
-            NoPreferredWordScore).Should().BeFalse();
+            new List<CustomFormat>()).Should().BeFalse();
         }
 
         [Test]
@@ -62,7 +61,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new List<QualityModel> { new QualityModel(Quality.MP3_320, new Revision(version: 1)) },
-            NoPreferredWordScore,
+            new List<CustomFormat>(),
             new QualityModel(Quality.MP3_320, new Revision(version: 2))).Should().BeTrue();
         }
 
@@ -76,12 +75,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new List<QualityModel> { new QualityModel(Quality.MP3_320, new Revision(version: 2)) },
-            NoPreferredWordScore,
+            new List<CustomFormat>(),
             new QualityModel(Quality.FLAC, new Revision(version: 2))).Should().BeFalse();
         }
 
         [Test]
-        public void should_return_true_if_cutoffs_are_met_and_score_is_higher()
+        public void should_return_true_if_cutoffs_are_met_but_is_a_revision_upgrade()
         {
             QualityProfile profile = new QualityProfile
             {
@@ -91,27 +90,26 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Subject.CutoffNotMet(
                 profile,
-                new List<QualityModel> { new QualityModel(Quality.MP3_320, new Revision(version: 2)) },
-                NoPreferredWordScore,
-                new QualityModel(Quality.FLAC, new Revision(version: 2)),
-                10).Should().BeTrue();
+                new List<QualityModel> { new QualityModel(Quality.FLAC, new Revision(version: 1)) },
+                new List<CustomFormat>(),
+                new QualityModel(Quality.FLAC, new Revision(version: 2))).Should().BeTrue();
         }
 
         [Test]
-        public void should_return_true_if_cutoffs_are_met_but_is_a_revision_upgrade()
+        public void should_return_false_if_quality_profile_does_not_allow_upgrades_but_cutoff_is_set_to_highest_quality()
         {
             QualityProfile profile = new QualityProfile
             {
-                Cutoff = Quality.MP3_320.Id,
+                Cutoff = Quality.FLAC_24.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = false
             };
 
             Subject.CutoffNotMet(
                 profile,
-                new List<QualityModel> { new QualityModel(Quality.FLAC, new Revision(version: 1)) },
-                NoPreferredWordScore,
-                new QualityModel(Quality.FLAC, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeTrue();
+                new List<QualityModel> { new QualityModel(Quality.MP3_320, new Revision(version: 1)) },
+                new List<CustomFormat>(),
+                new QualityModel(Quality.FLAC, new Revision(version: 2))).Should().BeFalse();
         }
     }
 }
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
index 3cec1e913..4a2b062fb 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
@@ -416,15 +416,15 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC));
             var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC));
 
-            remoteAlbum1.PreferredWordScore = 10;
-            remoteAlbum2.PreferredWordScore = 0;
+            remoteAlbum1.CustomFormatScore = 10;
+            remoteAlbum2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
             decisions.Add(new DownloadDecision(remoteAlbum2));
 
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
-            qualifiedReports.First().RemoteAlbum.PreferredWordScore.Should().Be(10);
+            qualifiedReports.First().RemoteAlbum.CustomFormatScore.Should().Be(10);
         }
 
         [Test]
@@ -437,8 +437,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(1)));
             var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(2)));
 
-            remoteAlbum1.PreferredWordScore = 10;
-            remoteAlbum2.PreferredWordScore = 0;
+            remoteAlbum1.CustomFormatScore = 10;
+            remoteAlbum2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
@@ -458,8 +458,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(1)));
             var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(2)));
 
-            remoteAlbum1.PreferredWordScore = 10;
-            remoteAlbum2.PreferredWordScore = 0;
+            remoteAlbum1.CustomFormatScore = 10;
+            remoteAlbum2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
@@ -479,8 +479,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(1)));
             var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(2)));
 
-            remoteAlbum1.PreferredWordScore = 10;
-            remoteAlbum2.PreferredWordScore = 0;
+            remoteAlbum1.CustomFormatScore = 10;
+            remoteAlbum2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
@@ -489,7 +489,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
             qualifiedReports.First().RemoteAlbum.ParsedAlbumInfo.Quality.Quality.Should().Be(Quality.FLAC);
             qualifiedReports.First().RemoteAlbum.ParsedAlbumInfo.Quality.Revision.Version.Should().Be(1);
-            qualifiedReports.First().RemoteAlbum.PreferredWordScore.Should().Be(10);
+            qualifiedReports.First().RemoteAlbum.CustomFormatScore.Should().Be(10);
         }
 
         [Test]
@@ -502,8 +502,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(1, 0)));
             var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.FLAC, new Revision(1, 1)));
 
-            remoteAlbum1.PreferredWordScore = 10;
-            remoteAlbum2.PreferredWordScore = 0;
+            remoteAlbum1.CustomFormatScore = 10;
+            remoteAlbum2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
@@ -513,7 +513,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             qualifiedReports.First().RemoteAlbum.ParsedAlbumInfo.Quality.Quality.Should().Be(Quality.FLAC);
             qualifiedReports.First().RemoteAlbum.ParsedAlbumInfo.Quality.Revision.Version.Should().Be(1);
             qualifiedReports.First().RemoteAlbum.ParsedAlbumInfo.Quality.Revision.Real.Should().Be(0);
-            qualifiedReports.First().RemoteAlbum.PreferredWordScore.Should().Be(10);
+            qualifiedReports.First().RemoteAlbum.CustomFormatScore.Should().Be(10);
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
index ca1bc44a7..4add10856 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
@@ -2,7 +2,9 @@ using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
+using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.Music;
@@ -10,6 +12,7 @@ using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Queue;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
@@ -31,11 +34,15 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             Mocker.Resolve<UpgradableSpecification>();
 
+            CustomFormatsTestHelpers.GivenCustomFormats();
+
             _artist = Builder<Artist>.CreateNew()
                                      .With(e => e.QualityProfile = new QualityProfile
                                      {
                                          UpgradeAllowed = true,
                                          Items = Qualities.QualityFixture.GetDefaultQualities(),
+                                         FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(),
+                                         MinFormatScore = 0
                                      })
                                      .Build();
 
@@ -59,8 +66,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                    .With(r => r.Artist = _artist)
                                                    .With(r => r.Albums = new List<Album> { _album })
                                                    .With(r => r.ParsedAlbumInfo = new ParsedAlbumInfo { Quality = new QualityModel(Quality.MP3_256) })
-                                                   .With(r => r.PreferredWordScore = 0)
+                                                   .With(r => r.CustomFormats = new List<CustomFormat>())
                                                    .Build();
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<RemoteAlbum>(), It.IsAny<long>()))
+                  .Returns(new List<CustomFormat>());
         }
 
         private void GivenEmptyQueue()
@@ -70,6 +81,13 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 .Returns(new List<Queue.Queue>());
         }
 
+        private void GivenQueueFormats(List<CustomFormat> formats)
+        {
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<RemoteAlbum>(), It.IsAny<long>()))
+                  .Returns(formats);
+        }
+
         private void GivenQueue(IEnumerable<RemoteAlbum> remoteAlbums, TrackedDownloadState trackedDownloadState = TrackedDownloadState.Downloading)
         {
             var queue = remoteAlbums.Select(remoteAlbum => new Queue.Queue
@@ -97,6 +115,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                        .With(r => r.Artist = _otherArtist)
                                                        .With(r => r.Albums = new List<Album> { _album })
                                                        .With(r => r.Release = _releaseInfo)
+                                                       .With(r => r.CustomFormats = new List<CustomFormat>())
                                                        .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -115,6 +134,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 {
                     Quality = new QualityModel(Quality.MP3_256)
                 })
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .With(r => r.Release = _releaseInfo)
                 .Build();
 
@@ -136,6 +156,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_192)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -153,6 +174,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_192)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -160,9 +182,17 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         }
 
         [Test]
-        public void should_return_true_when_qualities_are_the_same_with_higher_preferred_word_score()
+        public void should_return_true_when_qualities_are_the_same_with_higher_custom_format_score()
         {
-            _remoteAlbum.PreferredWordScore = 1;
+            _remoteAlbum.CustomFormats = new List<CustomFormat> { new CustomFormat("My Format", new ReleaseTitleSpecification { Value = "MP3" }) { Id = 1 } };
+
+            var lowFormat = new List<CustomFormat> { new CustomFormat("Bad Format", new ReleaseTitleSpecification { Value = "MP3" }) { Id = 2 } };
+
+            CustomFormatsTestHelpers.GivenCustomFormats(_remoteAlbum.CustomFormats.First(), lowFormat.First());
+
+            _artist.QualityProfile.Value.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("My Format");
+
+            GivenQueueFormats(lowFormat);
 
             var remoteAlbum = Builder<RemoteAlbum>.CreateNew()
                 .With(r => r.Artist = _artist)
@@ -172,6 +202,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Quality = new QualityModel(Quality.MP3_256)
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = lowFormat)
                 .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -189,6 +220,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_192)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -208,6 +240,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_320)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -225,6 +258,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_320)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -242,6 +276,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_320)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             _remoteAlbum.Albums.Add(_otherAlbum);
@@ -261,6 +296,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Quality = new QualityModel(Quality.MP3_320)
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             _remoteAlbum.Albums.Add(_otherAlbum);
@@ -275,6 +311,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteAlbums = Builder<RemoteAlbum>.CreateListOfSize(2)
                                                        .All()
                                                        .With(r => r.Artist = _artist)
+                                                       .With(r => r.CustomFormats = new List<CustomFormat>())
                                                        .With(r => r.ParsedAlbumInfo = new ParsedAlbumInfo
                                                        {
                                                            Quality = new QualityModel(Quality.MP3_320)
@@ -305,6 +342,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Quality = new QualityModel(Quality.FLAC)
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum });
@@ -324,6 +362,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Quality = new QualityModel(Quality.MP3_008)
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .Build();
 
             GivenQueue(new List<RemoteAlbum> { remoteAlbum }, TrackedDownloadState.DownloadFailedPending);
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/ReleaseRestrictionsSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/ReleaseRestrictionsSpecificationFixture.cs
index f54fafa08..c54ab3c3b 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/ReleaseRestrictionsSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/ReleaseRestrictionsSpecificationFixture.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -33,7 +34,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.SetConstant<ITermMatcherService>(Mocker.Resolve<TermMatcherService>());
         }
 
-        private void GivenRestictions(string required, string ignored)
+        private void GivenRestictions(List<string> required, List<string> ignored)
         {
             Mocker.GetMock<IReleaseProfileService>()
                   .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
@@ -60,7 +61,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_true_when_title_contains_one_required_term()
         {
-            GivenRestictions("WEBRip", null);
+            GivenRestictions(new List<string> { "WEBRip" }, new List<string>());
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -68,7 +69,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_false_when_title_does_not_contain_any_required_terms()
         {
-            GivenRestictions("doesnt,exist", null);
+            GivenRestictions(new List<string> { "doesnt", "exist" }, new List<string>());
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
@@ -76,7 +77,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_true_when_title_does_not_contain_any_ignored_terms()
         {
-            GivenRestictions(null, "ignored");
+            GivenRestictions(new List<string>(), new List<string> { "ignored" });
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -84,7 +85,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_false_when_title_contains_one_anded_ignored_terms()
         {
-            GivenRestictions(null, "edited");
+            GivenRestictions(new List<string>(), new List<string> { "edited" });
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
@@ -95,7 +96,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [TestCase("X264,NOTTHERE")]
         public void should_ignore_case_when_matching_required(string required)
         {
-            GivenRestictions(required, null);
+            GivenRestictions(required.Split(',').ToList(), new List<string>());
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -106,7 +107,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [TestCase("X264,NOTTHERE")]
         public void should_ignore_case_when_matching_ignored(string ignored)
         {
-            GivenRestictions(null, ignored);
+            GivenRestictions(new List<string>(), ignored.Split(',').ToList());
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
@@ -120,7 +121,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                   .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
                   .Returns(new List<ReleaseProfile>
                            {
-                               new ReleaseProfile { Required = "320", Ignored = "www.Speed.cd" }
+                               new ReleaseProfile { Required = new List<string> { "320" }, Ignored = new List<string> { "www.Speed.cd" } }
                            });
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
@@ -132,7 +133,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [TestCase(@"/\.WEB/", true)]
         public void should_match_perl_regex(string pattern, bool expected)
         {
-            GivenRestictions(pattern, null);
+            GivenRestictions(pattern.Split(',').ToList(), new List<string>());
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().Be(expected);
         }
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
index da4432241..7a8639cf6 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
@@ -5,6 +5,7 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.DecisionEngine.Specifications.RssSync;
 using NzbDrone.Core.Download.Pending;
@@ -87,7 +88,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
         private void GivenUpgradeForExistingFile()
         {
             Mocker.GetMock<IUpgradableSpecification>()
-                  .Setup(s => s.IsUpgradable(It.IsAny<QualityProfile>(), It.IsAny<List<QualityModel>>(), It.IsAny<int>(), It.IsAny<QualityModel>(), It.IsAny<int>()))
+                  .Setup(s => s.IsUpgradable(It.IsAny<QualityProfile>(), It.IsAny<List<QualityModel>>(), It.IsAny<List<CustomFormat>>(), It.IsAny<QualityModel>(), It.IsAny<List<CustomFormat>>()))
                   .Returns(true);
         }
 
@@ -117,10 +118,25 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
         }
 
         [Test]
-        public void should_be_true_when_quality_is_last_allowed_in_profile()
+        public void should_be_false_when_quality_is_last_allowed_in_profile_and_bypass_disabled()
         {
+            _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
             _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_320);
 
+            _delayProfile.UsenetDelay = 720;
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_be_true_when_quality_is_last_allowed_in_profile_and_bypass_enabled()
+        {
+            _delayProfile.UsenetDelay = 720;
+            _delayProfile.BypassIfHighestQuality = true;
+
+            _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
+            _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.FLAC);
+
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
 
@@ -194,5 +210,43 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
+
+        [Test]
+        public void should_be_false_when_custom_format_score_is_above_minimum_but_bypass_disabled()
+        {
+            _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
+            _remoteAlbum.CustomFormatScore = 100;
+
+            _delayProfile.UsenetDelay = 720;
+            _delayProfile.MinimumCustomFormatScore = 50;
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_be_false_when_custom_format_score_is_above_minimum_and_bypass_enabled_but_under_minimum()
+        {
+            _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
+            _remoteAlbum.CustomFormatScore = 5;
+
+            _delayProfile.UsenetDelay = 720;
+            _delayProfile.BypassIfAboveCustomFormatScore = true;
+            _delayProfile.MinimumCustomFormatScore = 50;
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_be_true_when_custom_format_score_is_above_minimum_and_bypass_enabled()
+        {
+            _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
+            _remoteAlbum.CustomFormatScore = 100;
+
+            _delayProfile.UsenetDelay = 720;
+            _delayProfile.BypassIfAboveCustomFormatScore = true;
+            _delayProfile.MinimumCustomFormatScore = 50;
+
+            Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
+        }
     }
 }
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/HistorySpecificationFixture.cs
similarity index 93%
rename from src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs
rename to src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/HistorySpecificationFixture.cs
index 514b0b178..43cf0122f 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/HistorySpecificationFixture.cs
@@ -5,6 +5,7 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.DecisionEngine.Specifications.RssSync;
 using NzbDrone.Core.History;
@@ -13,9 +14,10 @@ using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 
-namespace NzbDrone.Core.Test.DecisionEngineTests
+namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 {
     [TestFixture]
     public class HistorySpecificationFixture : CoreTest<HistorySpecification>
@@ -37,6 +39,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.Resolve<UpgradableSpecification>();
             _upgradeHistory = Mocker.Resolve<HistorySpecification>();
 
+            CustomFormatsTestHelpers.GivenCustomFormats();
+
             var singleAlbumList = new List<Album> { new Album { Id = FIRST_ALBUM_ID } };
             var doubleAlbumList = new List<Album>
             {
@@ -50,6 +54,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 {
                     UpgradeAllowed = true,
                     Cutoff = Quality.MP3_320.Id,
+                    FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("None"),
+                    MinFormatScore = 0,
                     Items = Qualities.QualityFixture.GetDefaultQualities()
                 })
                 .Build();
@@ -58,14 +64,16 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             {
                 Artist = _fakeArtist,
                 ParsedAlbumInfo = new ParsedAlbumInfo { Quality = new QualityModel(Quality.MP3_192, new Revision(version: 2)) },
-                Albums = doubleAlbumList
+                Albums = doubleAlbumList,
+                CustomFormats = new List<CustomFormat>()
             };
 
             _parseResultSingle = new RemoteAlbum
             {
                 Artist = _fakeArtist,
                 ParsedAlbumInfo = new ParsedAlbumInfo { Quality = new QualityModel(Quality.MP3_192, new Revision(version: 2)) },
-                Albums = singleAlbumList
+                Albums = singleAlbumList,
+                CustomFormats = new List<CustomFormat>()
             };
 
             _upgradableQuality = new QualityModel(Quality.MP3_192, new Revision(version: 1));
@@ -74,6 +82,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.GetMock<IConfigService>()
                   .SetupGet(s => s.EnableCompletedDownloadHandling)
                   .Returns(true);
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<EntityHistory>(), It.IsAny<Artist>()))
+                  .Returns(new List<CustomFormat>());
         }
 
         private void GivenMostRecentForAlbum(int albumId, string downloadId, QualityModel quality, DateTime date, EntityHistoryEventType eventType)
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeAllowedSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeAllowedSpecificationFixture.cs
index 43e431245..12d05989b 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeAllowedSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeAllowedSpecificationFixture.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
@@ -11,93 +13,197 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
     [TestFixture]
     public class UpgradeAllowedSpecificationFixture : CoreTest<UpgradableSpecification>
     {
+        private CustomFormat _customFormatOne;
+        private CustomFormat _customFormatTwo;
+        private QualityProfile _qualityProfile;
+
+        [SetUp]
+        public void Setup()
+        {
+            _customFormatOne = new CustomFormat
+            {
+                Id = 1,
+                Name = "One"
+            };
+            _customFormatTwo = new CustomFormat
+            {
+                Id = 2,
+                Name = "Two"
+            };
+
+            _qualityProfile = new QualityProfile
+            {
+                Cutoff = Quality.FLAC.Id,
+                Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = false,
+                CutoffFormatScore = 100,
+                FormatItems = new List<ProfileFormatItem>
+                {
+                    new ProfileFormatItem
+                    {
+                        Format = _customFormatOne,
+                        Score = 50
+                    },
+                    new ProfileFormatItem
+                    {
+                        Format = _customFormatTwo,
+                        Score = 100
+                    }
+                }
+            };
+        }
+
         [Test]
-        public void should_return_false_when_quality_is_better_and_upgrade_allowed_is_false_for_quality_profile()
+        public void should_return_false_when_quality_is_better_custom_formats_are_the_same_and_upgrading_is_not_allowed()
         {
+            _qualityProfile.UpgradeAllowed = false;
+
             Subject.IsUpgradeAllowed(
-                new QualityProfile
-                {
-                    Cutoff = Quality.FLAC.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = false
-                },
+                _qualityProfile,
                 new List<QualityModel> { new QualityModel(Quality.MP3_320) },
-                new QualityModel(Quality.FLAC))
+                new List<CustomFormat>(),
+                new QualityModel(Quality.FLAC),
+                new List<CustomFormat>())
             .Should().BeFalse();
         }
 
+        [Test]
+        public void should_return_false_when_quality_is_same_and_custom_format_is_upgrade_and_upgrading_is_not_allowed()
+        {
+            _qualityProfile.UpgradeAllowed = false;
+
+            Subject.IsUpgradeAllowed(
+                    _qualityProfile,
+                    new List<QualityModel> { new QualityModel(Quality.MP3_320) },
+                    new List<CustomFormat> { _customFormatOne },
+                    new QualityModel(Quality.MP3_320),
+                    new List<CustomFormat> { _customFormatTwo })
+                .Should().BeFalse();
+        }
+
+        [Test]
+        public void should_return_true_for_custom_format_upgrade_when_upgrading_is_allowed()
+        {
+            _qualityProfile.UpgradeAllowed = true;
+
+            Subject.IsUpgradeAllowed(
+                _qualityProfile,
+                new List<QualityModel> { new QualityModel(Quality.MP3_320) },
+                new List<CustomFormat> { _customFormatOne },
+                new QualityModel(Quality.MP3_320),
+                new List<CustomFormat> { _customFormatTwo })
+            .Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_for_same_custom_format_score_when_upgrading_is_not_allowed()
+        {
+            _qualityProfile.UpgradeAllowed = false;
+
+            Subject.IsUpgradeAllowed(
+                _qualityProfile,
+                new List<QualityModel> { new QualityModel(Quality.MP3_320) },
+                new List<CustomFormat> { _customFormatOne },
+                new QualityModel(Quality.MP3_320),
+                new List<CustomFormat> { _customFormatOne })
+            .Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_for_lower_custom_format_score_when_upgrading_is_allowed()
+        {
+            _qualityProfile.UpgradeAllowed = true;
+
+            Subject.IsUpgradeAllowed(
+                _qualityProfile,
+                new List<QualityModel> { new QualityModel(Quality.MP3_320) },
+                new List<CustomFormat> { _customFormatTwo },
+                new QualityModel(Quality.MP3_320),
+                new List<CustomFormat> { _customFormatOne })
+            .Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_for_lower_language_when_upgrading_is_not_allowed()
+        {
+            _qualityProfile.UpgradeAllowed = false;
+
+            Subject.IsUpgradeAllowed(
+                _qualityProfile,
+                new List<QualityModel> { new QualityModel(Quality.MP3_320) },
+                new List<CustomFormat> { _customFormatTwo },
+                new QualityModel(Quality.MP3_320),
+                new List<CustomFormat> { _customFormatOne })
+            .Should().BeTrue();
+        }
+
         [Test]
         public void should_return_true_for_quality_upgrade_when_upgrading_is_allowed()
         {
+            _qualityProfile.UpgradeAllowed = true;
+
             Subject.IsUpgradeAllowed(
-                new QualityProfile
-                {
-                    Cutoff = Quality.FLAC.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
+                _qualityProfile,
                 new List<QualityModel> { new QualityModel(Quality.MP3_320) },
-                new QualityModel(Quality.FLAC))
+                new List<CustomFormat>(),
+                new QualityModel(Quality.FLAC),
+                new List<CustomFormat>())
             .Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_for_same_quality_when_upgrading_is_allowed()
         {
+            _qualityProfile.UpgradeAllowed = true;
+
             Subject.IsUpgradeAllowed(
-                new QualityProfile
-                {
-                    Cutoff = Quality.FLAC.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
+                _qualityProfile,
                 new List<QualityModel> { new QualityModel(Quality.MP3_320) },
-                new QualityModel(Quality.MP3_320))
+                new List<CustomFormat>(),
+                new QualityModel(Quality.MP3_320),
+                new List<CustomFormat>())
             .Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_for_same_quality_when_upgrading_is_not_allowed()
         {
+            _qualityProfile.UpgradeAllowed = false;
+
             Subject.IsUpgradeAllowed(
-                new QualityProfile
-                {
-                    Cutoff = Quality.FLAC.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = false
-                },
+                _qualityProfile,
                 new List<QualityModel> { new QualityModel(Quality.MP3_320) },
-                new QualityModel(Quality.MP3_320))
+                new List<CustomFormat>(),
+                new QualityModel(Quality.MP3_320),
+                new List<CustomFormat>())
             .Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_for_lower_quality_when_upgrading_is_allowed()
         {
+            _qualityProfile.UpgradeAllowed = true;
+
             Subject.IsUpgradeAllowed(
-                new QualityProfile
-                {
-                    Cutoff = Quality.FLAC.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
+                _qualityProfile,
                 new List<QualityModel> { new QualityModel(Quality.MP3_320) },
-                new QualityModel(Quality.MP3_256))
+                new List<CustomFormat>(),
+                new QualityModel(Quality.MP3_192),
+                new List<CustomFormat>())
             .Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_for_lower_quality_when_upgrading_is_not_allowed()
         {
+            _qualityProfile.UpgradeAllowed = false;
+
             Subject.IsUpgradeAllowed(
-                new QualityProfile
-                {
-                    Cutoff = Quality.FLAC.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = false
-                },
+                _qualityProfile,
                 new List<QualityModel> { new QualityModel(Quality.MP3_320) },
-                new QualityModel(Quality.MP3_256))
+                new List<CustomFormat>(),
+                new QualityModel(Quality.MP3_192),
+                new List<CustomFormat>())
             .Should().BeTrue();
         }
     }
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
index 7fa65e375..d6f144668 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
@@ -4,12 +4,15 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
@@ -28,6 +31,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             Mocker.Resolve<UpgradableSpecification>();
 
+            CustomFormatsTestHelpers.GivenCustomFormats();
+
             _firstFile = new TrackFile { Quality = new QualityModel(Quality.FLAC, new Revision(version: 2)), DateAdded = DateTime.Now };
             _secondFile = new TrackFile { Quality = new QualityModel(Quality.FLAC, new Revision(version: 2)), DateAdded = DateTime.Now };
 
@@ -39,7 +44,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                          {
                              UpgradeAllowed = true,
                              Cutoff = Quality.MP3_320.Id,
-                             Items = Qualities.QualityFixture.GetDefaultQualities()
+                             Items = Qualities.QualityFixture.GetDefaultQualities(),
+                             FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("None"),
+                             MinFormatScore = 0,
                          })
                          .Build();
 
@@ -55,15 +62,21 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             {
                 Artist = fakeArtist,
                 ParsedAlbumInfo = new ParsedAlbumInfo { Quality = new QualityModel(Quality.MP3_256, new Revision(version: 2)) },
-                Albums = doubleAlbumList
+                Albums = doubleAlbumList,
+                CustomFormats = new List<CustomFormat>()
             };
 
             _parseResultSingle = new RemoteAlbum
             {
                 Artist = fakeArtist,
                 ParsedAlbumInfo = new ParsedAlbumInfo { Quality = new QualityModel(Quality.MP3_256, new Revision(version: 2)) },
-                Albums = singleAlbumList
+                Albums = singleAlbumList,
+                CustomFormats = new List<CustomFormat>()
             };
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<TrackFile>()))
+                  .Returns(new List<CustomFormat>());
         }
 
         private void WithFirstFileUpgradable()
@@ -148,6 +161,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_false_if_some_tracks_are_upgradable_and_some_are_downgrades()
         {
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<TrackFile>()))
+                  .Returns(new List<CustomFormat>());
+
             WithFirstFileUpgradable();
             _parseResultSingle.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_320);
             Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse();
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs
index f284f9688..c23dfd375 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
@@ -23,8 +24,6 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             new object[] { Quality.MP3_320, 1, Quality.MP3_320, 1, Quality.MP3_320, false }
         };
 
-        private static readonly int NoPreferredWordScore = 0;
-
         private void GivenAutoDownloadPropers(ProperDownloadTypes type)
         {
             Mocker.GetMock<IConfigService>()
@@ -47,9 +46,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsUpgradable(
                         profile,
                         new List<QualityModel> { new QualityModel(current, new Revision(version: currentVersion)) },
-                        NoPreferredWordScore,
+                        new List<CustomFormat>(),
                         new QualityModel(newQuality, new Revision(version: newVersion)),
-                        NoPreferredWordScore)
+                        new List<CustomFormat>())
                    .Should().Be(expected);
         }
 
@@ -66,9 +65,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsUpgradable(
                         profile,
                         new List<QualityModel> { new QualityModel(Quality.MP3_256, new Revision(version: 1)) },
-                        NoPreferredWordScore,
+                        new List<CustomFormat>(),
                         new QualityModel(Quality.MP3_256, new Revision(version: 2)),
-                        NoPreferredWordScore)
+                        new List<CustomFormat>())
                     .Should().BeTrue();
         }
 
@@ -85,9 +84,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsUpgradable(
                         profile,
                         new List<QualityModel> { new QualityModel(Quality.MP3_256, new Revision(version: 1)) },
-                        NoPreferredWordScore,
+                        new List<CustomFormat>(),
                         new QualityModel(Quality.MP3_256, new Revision(version: 2)),
-                        NoPreferredWordScore)
+                        new List<CustomFormat>())
                     .Should().BeFalse();
         }
     }
diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
index f628c86ac..601609193 100644
--- a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
@@ -104,6 +104,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                                                    .With(h => h.Title = title)
                                                    .With(h => h.Release = release)
                                                    .With(h => h.Reason = reason)
+                                                   .With(h => h.ParsedAlbumInfo = _parsedAlbumInfo)
                                                    .Build();
 
             _heldReleases.AddRange(heldReleases);
diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs
index 0784006ac..095ee8c78 100644
--- a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs
@@ -52,7 +52,9 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _pending.Add(new PendingRelease
             {
                 Id = id,
-                ParsedAlbumInfo = new ParsedAlbumInfo { AlbumTitle = album }
+                Title = "Artist.Title-Album.Title.abc-Lidarr",
+                ParsedAlbumInfo = new ParsedAlbumInfo { AlbumTitle = album },
+                Release = Builder<ReleaseInfo>.CreateNew().Build()
             });
         }
 
diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupQualityProfileFormatItemsFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupQualityProfileFormatItemsFixture.cs
new file mode 100644
index 000000000..14bb29f3a
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupQualityProfileFormatItemsFixture.cs
@@ -0,0 +1,134 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Profiles.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class CleanupQualityProfileFormatItemsFixture : DbTest<CleanupQualityProfileFormatItems, QualityProfile>
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Mocker.SetConstant<IQualityProfileFormatItemsCleanupRepository>(
+                new QualityProfileFormatItemsCleanupRepository(Mocker.Resolve<IMainDatabase>(), Mocker.Resolve<IEventAggregator>()));
+
+            Mocker.SetConstant<ICustomFormatRepository>(
+                new CustomFormatRepository(Mocker.Resolve<IMainDatabase>(), Mocker.Resolve<IEventAggregator>()));
+        }
+
+        [Test]
+        public void should_remove_orphaned_custom_formats()
+        {
+            var qualityProfile = Builder<QualityProfile>.CreateNew()
+                .With(h => h.Items = Qualities.QualityFixture.GetDefaultQualities())
+                .With(h => h.MinFormatScore = 50)
+                .With(h => h.CutoffFormatScore = 100)
+                .With(h => h.FormatItems = new List<ProfileFormatItem>
+                {
+                    Builder<ProfileFormatItem>.CreateNew()
+                        .With(c => c.Format = new CustomFormat("My Custom Format") { Id = 0 })
+                        .Build()
+                })
+                .BuildNew();
+
+            Db.Insert(qualityProfile);
+            Subject.Clean();
+
+            var result = AllStoredModels;
+
+            result.Should().HaveCount(1);
+            result.First().FormatItems.Should().BeEmpty();
+            result.First().MinFormatScore.Should().Be(0);
+            result.First().CutoffFormatScore.Should().Be(0);
+        }
+
+        [Test]
+        public void should_not_remove_unorphaned_custom_formats()
+        {
+            var minFormatScore = 50;
+            var cutoffFormatScore = 100;
+
+            var customFormat = Builder<CustomFormat>.CreateNew()
+                .With(h => h.Specifications = new List<ICustomFormatSpecification>())
+                .BuildNew();
+
+            Db.Insert(customFormat);
+
+            var qualityProfile = Builder<QualityProfile>.CreateNew()
+                .With(h => h.Items = Qualities.QualityFixture.GetDefaultQualities())
+                .With(h => h.MinFormatScore = minFormatScore)
+                .With(h => h.CutoffFormatScore = cutoffFormatScore)
+                .With(h => h.FormatItems = new List<ProfileFormatItem>
+                {
+                    Builder<ProfileFormatItem>.CreateNew()
+                        .With(c => c.Format = customFormat)
+                        .Build()
+                })
+                .BuildNew();
+
+            Db.Insert(qualityProfile);
+
+            Subject.Clean();
+            var result = AllStoredModels;
+
+            result.Should().HaveCount(1);
+            result.First().FormatItems.Should().HaveCount(1);
+            result.First().MinFormatScore.Should().Be(minFormatScore);
+            result.First().CutoffFormatScore.Should().Be(cutoffFormatScore);
+        }
+
+        [Test]
+        public void should_add_missing_custom_formats()
+        {
+            var minFormatScore = 50;
+            var cutoffFormatScore = 100;
+
+            var customFormat1 = Builder<CustomFormat>.CreateNew()
+                .With(h => h.Id = 1)
+                .With(h => h.Name = "Custom Format 1")
+                .With(h => h.Specifications = new List<ICustomFormatSpecification>())
+                .BuildNew();
+
+            var customFormat2 = Builder<CustomFormat>.CreateNew()
+                .With(h => h.Id = 2)
+                .With(h => h.Name = "Custom Format 2")
+                .With(h => h.Specifications = new List<ICustomFormatSpecification>())
+                .BuildNew();
+
+            Db.Insert(customFormat1);
+            Db.Insert(customFormat2);
+
+            var qualityProfile = Builder<QualityProfile>.CreateNew()
+                .With(h => h.Items = Qualities.QualityFixture.GetDefaultQualities())
+                .With(h => h.MinFormatScore = minFormatScore)
+                .With(h => h.CutoffFormatScore = cutoffFormatScore)
+                .With(h => h.FormatItems = new List<ProfileFormatItem>
+                {
+                    Builder<ProfileFormatItem>.CreateNew()
+                        .With(c => c.Format = customFormat1)
+                        .Build()
+                })
+                .BuildNew();
+
+            Db.Insert(qualityProfile);
+
+            Subject.Clean();
+            var result = AllStoredModels;
+
+            result.Should().HaveCount(1);
+            result.First().FormatItems.Should().HaveCount(2);
+            result.First().MinFormatScore.Should().Be(minFormatScore);
+            result.First().CutoffFormatScore.Should().Be(cutoffFormatScore);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/GetSceneNameFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/GetSceneNameFixture.cs
new file mode 100644
index 000000000..22f0b9b9a
--- /dev/null
+++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/GetSceneNameFixture.cs
@@ -0,0 +1,143 @@
+using System.Collections.Generic;
+using System.IO;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Profiles.Qualities;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
+{
+    [TestFixture]
+    public class GetSceneNameFixture : CoreTest
+    {
+        private LocalTrack _localEpisode;
+        private string _seasonName = "artist.title-album.title.FLAC-ingot";
+        private string _episodeName = "artist.title-album.title.FLAC-ingot";
+
+        [SetUp]
+        public void Setup()
+        {
+            var series = Builder<Artist>.CreateNew()
+                                        .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() })
+                                        .With(s => s.Path = @"C:\Test\Music\Artist Title".AsOsAgnostic())
+                                        .Build();
+
+            var episode = Builder<Track>.CreateNew()
+                                          .Build();
+
+            _localEpisode = new LocalTrack
+            {
+                Artist = series,
+                Tracks = new List<Track> { episode },
+                Path = Path.Combine(series.Path, "01 Some Body Loves.mkv"),
+                Quality = new QualityModel(Quality.FLAC),
+                ReleaseGroup = "DRONE"
+            };
+        }
+
+        [Test]
+        public void should_use_download_client_item_title_as_scene_name()
+        {
+            _localEpisode.DownloadClientAlbumInfo = new ParsedAlbumInfo
+            {
+                ReleaseTitle = _episodeName
+            };
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .Be(_episodeName);
+        }
+
+        [Test]
+        public void should_not_use_download_client_item_title_as_scene_name_if_full_season()
+        {
+            _localEpisode.DownloadClientAlbumInfo = new ParsedAlbumInfo
+            {
+                ReleaseTitle = _seasonName,
+                Discography = true
+            };
+
+            _localEpisode.Path = Path.Combine(@"C:\Test\Unsorted TV", _seasonName, _episodeName)
+                                     .AsOsAgnostic();
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_not_use_file_name_as_scenename_if_it_doesnt_look_like_scenename()
+        {
+            _localEpisode.Path = Path.Combine(@"C:\Test\Unsorted TV", _episodeName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_not_use_folder_name_as_scenename_if_it_doesnt_look_like_scenename()
+        {
+            _localEpisode.Path = Path.Combine(@"C:\Test\Unsorted TV", _episodeName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            _localEpisode.FolderAlbumInfo = new ParsedAlbumInfo
+            {
+                ReleaseTitle = "aaaaa"
+            };
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_not_use_folder_name_as_scenename_if_it_is_for_a_full_season()
+        {
+            _localEpisode.Path = Path.Combine(@"C:\Test\Unsorted TV", _episodeName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            _localEpisode.FolderAlbumInfo = new ParsedAlbumInfo
+            {
+                ReleaseTitle = _seasonName,
+                Discography = true
+            };
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_not_use_folder_name_as_scenename_if_there_are_other_video_files()
+        {
+            _localEpisode.Path = Path.Combine(@"C:\Test\Unsorted TV", _episodeName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            _localEpisode.FolderAlbumInfo = new ParsedAlbumInfo
+            {
+                ReleaseTitle = _seasonName,
+                Discography = false
+            };
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .BeNull();
+        }
+
+        [TestCase(".flac")]
+        [TestCase(".par2")]
+        [TestCase(".nzb")]
+        public void should_remove_extension_from_nzb_title_for_scene_name(string extension)
+        {
+            _localEpisode.DownloadClientAlbumInfo = new ParsedAlbumInfo
+            {
+                ReleaseTitle = _episodeName + extension
+            };
+
+            SceneNameCalculator.GetSceneName(_localEpisode).Should()
+                               .Be(_episodeName);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/SameFileSpecificationFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/SameFileSpecificationFixture.cs
deleted file mode 100644
index c77f00504..000000000
--- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/SameFileSpecificationFixture.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.TrackImport.Specifications;
-using NzbDrone.Core.Music;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Specifications
-{
-    [TestFixture]
-    public class SameFileSpecificationFixture : CoreTest<SameFileSpecification>
-    {
-        private LocalTrack _localTrack;
-
-        [SetUp]
-        public void Setup()
-        {
-            _localTrack = Builder<LocalTrack>.CreateNew()
-                                                 .With(l => l.Size = 150.Megabytes())
-                                                 .Build();
-        }
-
-        [Test]
-        public void should_be_accepted_if_no_existing_file()
-        {
-            _localTrack.Tracks = Builder<Track>.CreateListOfSize(1)
-                                                     .TheFirst(1)
-                                                     .With(e => e.TrackFileId = 0)
-                                                     .BuildList();
-
-            Subject.IsSatisfiedBy(_localTrack, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_accepted_if_multiple_existing_files()
-        {
-            _localTrack.Tracks = Builder<Track>.CreateListOfSize(2)
-                                                     .TheFirst(1)
-                                                     .With(e => e.TrackFileId = 1)
-                                                     .With(e => e.TrackFile = new LazyLoaded<TrackFile>(
-                                                                                new TrackFile
-                                                                                {
-                                                                                    Size = _localTrack.Size
-                                                                                }))
-                                                     .TheNext(1)
-                                                     .With(e => e.TrackFileId = 2)
-                                                     .With(e => e.TrackFile = new LazyLoaded<TrackFile>(
-                                                                                new TrackFile
-                                                                                {
-                                                                                    Size = _localTrack.Size
-                                                                                }))
-                                                     .Build()
-                                                     .ToList();
-
-            Subject.IsSatisfiedBy(_localTrack, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_accepted_if_file_size_is_different()
-        {
-            _localTrack.Tracks = Builder<Track>.CreateListOfSize(1)
-                                                     .TheFirst(1)
-                                                     .With(e => e.TrackFileId = 1)
-                                                     .With(e => e.TrackFile = new LazyLoaded<TrackFile>(
-                                                                                new TrackFile
-                                                                                {
-                                                                                    Size = _localTrack.Size + 100.Megabytes()
-                                                                                }))
-                                                     .Build()
-                                                     .ToList();
-
-            Subject.IsSatisfiedBy(_localTrack, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_reject_if_file_size_is_the_same()
-        {
-            _localTrack.Tracks = Builder<Track>.CreateListOfSize(1)
-                                                     .TheFirst(1)
-                                                     .With(e => e.TrackFileId = 1)
-                                                     .With(e => e.TrackFile = new LazyLoaded<TrackFile>(
-                                                                                new TrackFile
-                                                                                {
-                                                                                    Size = _localTrack.Size
-                                                                                }))
-                                                     .Build()
-                                                     .ToList();
-
-            Subject.IsSatisfiedBy(_localTrack, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_be_accepted_if_file_cannot_be_fetched()
-        {
-            _localTrack.Tracks = Builder<Track>.CreateListOfSize(1)
-                .TheFirst(1)
-                .With(e => e.TrackFileId = 1)
-                .With(e => e.TrackFile = new LazyLoaded<TrackFile>((TrackFile)null))
-                .Build()
-                .ToList();
-
-            Subject.IsSatisfiedBy(_localTrack, null).Accepted.Should().BeTrue();
-        }
-    }
-}
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
index f6a5fd350..0a637fc17 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Organizer;
@@ -56,6 +57,10 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
                 .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
         }
 
         [TestCase("Florence + the Machine", "Florence + the Machine")]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
index ec91f3fbd..0cb0e2f3a 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Datastore;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Organizer;
@@ -114,6 +114,10 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
                 .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
         }
 
         private void GivenProper()
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
index 1c47ef371..7a16bfbdd 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Organizer;
@@ -56,6 +57,10 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
                 .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
         }
 
         [TestCase("The Mist", "Mist, The")]
diff --git a/src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs b/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs
similarity index 95%
rename from src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs
rename to src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs
index 6ee2c0938..cec84c874 100644
--- a/src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs
@@ -1,7 +1,9 @@
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.ImportLists;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Music;
@@ -13,11 +15,15 @@ namespace NzbDrone.Core.Test.Profiles
 {
     [TestFixture]
 
-    public class ProfileServiceFixture : CoreTest<QualityProfileService>
+    public class QualityProfileServiceFixture : CoreTest<QualityProfileService>
     {
         [Test]
         public void init_should_add_default_profiles()
         {
+            Mocker.GetMock<ICustomFormatService>()
+                .Setup(s => s.All())
+                .Returns(new List<CustomFormat>());
+
             Subject.Handle(new ApplicationStartedEvent());
 
             Mocker.GetMock<IProfileRepository>()
diff --git a/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/CalculateFixture.cs b/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/CalculateFixture.cs
deleted file mode 100644
index a93187f9f..000000000
--- a/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/CalculateFixture.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Music;
-using NzbDrone.Core.Profiles.Releases;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Profiles.Releases.PreferredWordService
-{
-    [TestFixture]
-    public class CalculateFixture : CoreTest<Core.Profiles.Releases.PreferredWordService>
-    {
-        private Artist _artist = null;
-        private List<ReleaseProfile> _releaseProfiles = null;
-        private string _title = "Artist.Name-Album.Title.2018.FLAC.24bit-Lidarr";
-
-        [SetUp]
-        public void Setup()
-        {
-            _artist = Builder<Artist>.CreateNew()
-                                     .With(s => s.Tags = new HashSet<int>(new[] { 1, 2 }))
-                                     .Build();
-
-            _releaseProfiles = new List<ReleaseProfile>();
-
-            _releaseProfiles.Add(new ReleaseProfile
-            {
-                Preferred = new List<KeyValuePair<string, int>>
-                                                 {
-                                                     new KeyValuePair<string, int>("24bit", 5),
-                                                     new KeyValuePair<string, int>("16bit", -10)
-                                                 }
-            });
-
-            Mocker.GetMock<IReleaseProfileService>()
-                  .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
-                  .Returns(_releaseProfiles);
-        }
-
-        private void GivenMatchingTerms(params string[] terms)
-        {
-            Mocker.GetMock<ITermMatcherService>()
-                  .Setup(s => s.IsMatch(It.IsAny<string>(), _title))
-                  .Returns<string, string>((term, title) => terms.Contains(term));
-        }
-
-        [Test]
-        public void should_return_0_when_there_are_no_release_profiles()
-        {
-            Mocker.GetMock<IReleaseProfileService>()
-                  .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
-                  .Returns(new List<ReleaseProfile>());
-
-            Subject.Calculate(_artist, _title, 0).Should().Be(0);
-        }
-
-        [Test]
-        public void should_return_0_when_there_are_no_matching_preferred_words()
-        {
-            GivenMatchingTerms();
-
-            Subject.Calculate(_artist, _title, 0).Should().Be(0);
-        }
-
-        [Test]
-        public void should_calculate_positive_score()
-        {
-            GivenMatchingTerms("24bit");
-
-            Subject.Calculate(_artist, _title, 0).Should().Be(5);
-        }
-
-        [Test]
-        public void should_calculate_negative_score()
-        {
-            GivenMatchingTerms("16bit");
-
-            Subject.Calculate(_artist, _title, 0).Should().Be(-10);
-        }
-
-        [Test]
-        public void should_calculate_using_multiple_profiles()
-        {
-            _releaseProfiles.Add(_releaseProfiles.First());
-
-            GivenMatchingTerms("24bit");
-
-            Subject.Calculate(_artist, _title, 0).Should().Be(10);
-        }
-    }
-}
diff --git a/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs b/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs
deleted file mode 100644
index 677f0193d..000000000
--- a/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Music;
-using NzbDrone.Core.Profiles.Releases;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Profiles.Releases.PreferredWordService
-{
-    [TestFixture]
-    public class GetMatchingPreferredWordsFixture : CoreTest<Core.Profiles.Releases.PreferredWordService>
-    {
-        private Artist _artist = null;
-        private List<ReleaseProfile> _releaseProfiles = null;
-        private string _title = "Artist.Name-Album.Name-2018-Flac-Vinyl-Lidarr";
-
-        [SetUp]
-        public void Setup()
-        {
-            _artist = Builder<Artist>.CreateNew()
-                                     .With(s => s.Tags = new HashSet<int>(new[] { 1, 2 }))
-                                     .Build();
-
-            _releaseProfiles = new List<ReleaseProfile>();
-
-            _releaseProfiles.Add(new ReleaseProfile
-            {
-                Preferred = new List<KeyValuePair<string, int>>
-                                                 {
-                                                     new KeyValuePair<string, int>("Vinyl", 5),
-                                                     new KeyValuePair<string, int>("CD", -10)
-                                                 }
-            });
-
-            Mocker.GetMock<ITermMatcherService>()
-                  .Setup(s => s.MatchingTerm(It.IsAny<string>(), _title))
-                  .Returns<string, string>((term, title) => title.Contains(term) ? term : null);
-        }
-
-        private void GivenReleaseProfile()
-        {
-            Mocker.GetMock<IReleaseProfileService>()
-                  .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
-                  .Returns(_releaseProfiles);
-        }
-
-        [Test]
-        public void should_return_empty_list_when_there_are_no_release_profiles()
-        {
-            Mocker.GetMock<IReleaseProfileService>()
-                  .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
-                  .Returns(new List<ReleaseProfile>());
-
-            Subject.GetMatchingPreferredWords(_artist, _title).Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_empty_list_when_there_are_no_matching_preferred_words()
-        {
-            _releaseProfiles.First().Preferred.RemoveAt(0);
-            GivenReleaseProfile();
-
-            Subject.GetMatchingPreferredWords(_artist, _title).Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_list_of_matching_terms()
-        {
-            GivenReleaseProfile();
-
-            Subject.GetMatchingPreferredWords(_artist, _title).Should().Contain(new[] { "Vinyl" });
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/Annotations/SelectOption.cs b/src/NzbDrone.Core/Annotations/SelectOption.cs
new file mode 100644
index 000000000..feef0c342
--- /dev/null
+++ b/src/NzbDrone.Core/Annotations/SelectOption.cs
@@ -0,0 +1,10 @@
+namespace NzbDrone.Core.Annotations
+{
+    public class SelectOption
+    {
+        public int Value { get; set; }
+        public string Name { get; set; }
+        public int Order { get; set; }
+        public string Hint { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/Annotations/SelectOptionsConverter.cs b/src/NzbDrone.Core/Annotations/SelectOptionsConverter.cs
new file mode 100644
index 000000000..4451dc716
--- /dev/null
+++ b/src/NzbDrone.Core/Annotations/SelectOptionsConverter.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace NzbDrone.Core.Annotations
+{
+    public interface ISelectOptionsConverter
+    {
+        List<SelectOption> GetSelectOptions();
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormat.cs b/src/NzbDrone.Core/CustomFormats/CustomFormat.cs
new file mode 100644
index 000000000..51e61e287
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormat.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class CustomFormat : ModelBase, IEquatable<CustomFormat>
+    {
+        public CustomFormat()
+        {
+        }
+
+        public CustomFormat(string name, params ICustomFormatSpecification[] specs)
+        {
+            Name = name;
+            Specifications = specs.ToList();
+        }
+
+        public string Name { get; set; }
+
+        public bool IncludeCustomFormatWhenRenaming { get; set; }
+
+        public List<ICustomFormatSpecification> Specifications { get; set; }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public bool Equals(CustomFormat other)
+        {
+            if (other is null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, other))
+            {
+                return true;
+            }
+
+            return int.Equals(Id, other.Id);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+
+            if (obj.GetType() != GetType())
+            {
+                return false;
+            }
+
+            return Equals((CustomFormat)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Id;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
new file mode 100644
index 000000000..c535d6bfc
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
@@ -0,0 +1,183 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Blocklisting;
+using NzbDrone.Core.History;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public interface ICustomFormatCalculationService
+    {
+        List<CustomFormat> ParseCustomFormat(RemoteAlbum remoteAlbum, long size);
+        List<CustomFormat> ParseCustomFormat(TrackFile trackFile, Artist artist);
+        List<CustomFormat> ParseCustomFormat(TrackFile trackFile);
+        List<CustomFormat> ParseCustomFormat(Blocklist blocklist, Artist artist);
+        List<CustomFormat> ParseCustomFormat(EntityHistory history, Artist artist);
+        List<CustomFormat> ParseCustomFormat(LocalTrack localTrack);
+    }
+
+    public class CustomFormatCalculationService : ICustomFormatCalculationService
+    {
+        private readonly ICustomFormatService _formatService;
+
+        public CustomFormatCalculationService(ICustomFormatService formatService)
+        {
+            _formatService = formatService;
+        }
+
+        public List<CustomFormat> ParseCustomFormat(RemoteAlbum remoteAlbum, long size)
+        {
+            var input = new CustomFormatInput
+            {
+                AlbumInfo = remoteAlbum.ParsedAlbumInfo,
+                Artist = remoteAlbum.Artist,
+                Size = size
+            };
+
+            return ParseCustomFormat(input);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(TrackFile trackFile, Artist artist)
+        {
+            return ParseCustomFormat(trackFile, artist, _formatService.All());
+        }
+
+        public List<CustomFormat> ParseCustomFormat(TrackFile trackFile)
+        {
+            return ParseCustomFormat(trackFile, trackFile.Artist.Value, _formatService.All());
+        }
+
+        public List<CustomFormat> ParseCustomFormat(Blocklist blocklist, Artist artist)
+        {
+            var parsed = Parser.Parser.ParseAlbumTitle(blocklist.SourceTitle);
+
+            var episodeInfo = new ParsedAlbumInfo
+            {
+                ArtistName = artist.Name,
+                ReleaseTitle = parsed?.ReleaseTitle ?? blocklist.SourceTitle,
+                Quality = blocklist.Quality,
+                ReleaseGroup = parsed?.ReleaseGroup
+            };
+
+            var input = new CustomFormatInput
+            {
+                AlbumInfo = episodeInfo,
+                Artist = artist,
+                Size = blocklist.Size ?? 0
+            };
+
+            return ParseCustomFormat(input);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(EntityHistory history, Artist artist)
+        {
+            var parsed = Parser.Parser.ParseAlbumTitle(history.SourceTitle);
+
+            long.TryParse(history.Data.GetValueOrDefault("size"), out var size);
+
+            var albumInfo = new ParsedAlbumInfo
+            {
+                ArtistName = artist.Name,
+                ReleaseTitle = parsed?.ReleaseTitle ?? history.SourceTitle,
+                Quality = history.Quality,
+                ReleaseGroup = parsed?.ReleaseGroup,
+            };
+
+            var input = new CustomFormatInput
+            {
+                AlbumInfo = albumInfo,
+                Artist = artist,
+                Size = size
+            };
+
+            return ParseCustomFormat(input);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(LocalTrack localTrack)
+        {
+            var albumInfo = new ParsedAlbumInfo
+            {
+                ArtistName = localTrack.Artist.Name,
+                ReleaseTitle = localTrack.SceneName,
+                Quality = localTrack.Quality,
+                ReleaseGroup = localTrack.ReleaseGroup
+            };
+
+            var input = new CustomFormatInput
+            {
+                AlbumInfo = albumInfo,
+                Artist = localTrack.Artist,
+                Size = localTrack.Size
+            };
+
+            return ParseCustomFormat(input);
+        }
+
+        private List<CustomFormat> ParseCustomFormat(CustomFormatInput input)
+        {
+            return ParseCustomFormat(input, _formatService.All());
+        }
+
+        private static List<CustomFormat> ParseCustomFormat(CustomFormatInput input, List<CustomFormat> allCustomFormats)
+        {
+            var matches = new List<CustomFormat>();
+
+            foreach (var customFormat in allCustomFormats)
+            {
+                var specificationMatches = customFormat.Specifications
+                    .GroupBy(t => t.GetType())
+                    .Select(g => new SpecificationMatchesGroup
+                    {
+                        Matches = g.ToDictionary(t => t, t => t.IsSatisfiedBy(input))
+                    })
+                    .ToList();
+
+                if (specificationMatches.All(x => x.DidMatch))
+                {
+                    matches.Add(customFormat);
+                }
+            }
+
+            return matches;
+        }
+
+        private static List<CustomFormat> ParseCustomFormat(TrackFile trackFile, Artist artist, List<CustomFormat> allCustomFormats)
+        {
+            var sceneName = string.Empty;
+            if (trackFile.SceneName.IsNotNullOrWhiteSpace())
+            {
+                sceneName = trackFile.SceneName;
+            }
+            else if (trackFile.OriginalFilePath.IsNotNullOrWhiteSpace())
+            {
+                sceneName = trackFile.OriginalFilePath;
+            }
+            else if (trackFile.Path.IsNotNullOrWhiteSpace())
+            {
+                sceneName = Path.GetFileName(trackFile.Path);
+            }
+
+            var episodeInfo = new ParsedAlbumInfo
+            {
+                ArtistName = artist.Name,
+                ReleaseTitle = sceneName,
+                Quality = trackFile.Quality,
+                ReleaseGroup = trackFile.ReleaseGroup
+            };
+
+            var input = new CustomFormatInput
+            {
+                AlbumInfo = episodeInfo,
+                Artist = artist,
+                Size = trackFile.Size,
+                Filename = Path.GetFileName(trackFile.Path)
+            };
+
+            return ParseCustomFormat(input, allCustomFormats);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatInput.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatInput.cs
new file mode 100644
index 000000000..5d9018070
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatInput.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class CustomFormatInput
+    {
+        public ParsedAlbumInfo AlbumInfo { get; set; }
+        public Artist Artist { get; set; }
+        public long Size { get; set; }
+        public string Filename { get; set; }
+
+        // public CustomFormatInput(ParsedEpisodeInfo episodeInfo, Series series)
+        // {
+        //     EpisodeInfo = episodeInfo;
+        //     Series = series;
+        // }
+        //
+        // public CustomFormatInput(ParsedEpisodeInfo episodeInfo, Series series, long size, List<Language> languages)
+        // {
+        //     EpisodeInfo = episodeInfo;
+        //     Series = series;
+        //     Size = size;
+        //     Languages = languages;
+        // }
+        //
+        // public CustomFormatInput(ParsedEpisodeInfo episodeInfo, Series series, long size, List<Language> languages, string filename)
+        // {
+        //     EpisodeInfo = episodeInfo;
+        //     Series = series;
+        //     Size = size;
+        //     Languages = languages;
+        //     Filename = filename;
+        // }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatRepository.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatRepository.cs
new file mode 100644
index 000000000..0a8e868d9
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatRepository.cs
@@ -0,0 +1,17 @@
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Messaging.Events;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public interface ICustomFormatRepository : IBasicRepository<CustomFormat>
+    {
+    }
+
+    public class CustomFormatRepository : BasicRepository<CustomFormat>, ICustomFormatRepository
+    {
+        public CustomFormatRepository(IMainDatabase database, IEventAggregator eventAggregator)
+            : base(database, eventAggregator)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs
new file mode 100644
index 000000000..4ba022e44
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs
@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Common.Cache;
+using NzbDrone.Core.CustomFormats.Events;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Messaging.Events;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public interface ICustomFormatService
+    {
+        void Update(CustomFormat customFormat);
+        CustomFormat Insert(CustomFormat customFormat);
+        List<CustomFormat> All();
+        CustomFormat GetById(int id);
+        void Delete(int id);
+    }
+
+    public class CustomFormatService : ICustomFormatService
+    {
+        private readonly ICustomFormatRepository _formatRepository;
+        private readonly IEventAggregator _eventAggregator;
+        private readonly ICached<Dictionary<int, CustomFormat>> _cache;
+
+        public CustomFormatService(ICustomFormatRepository formatRepository,
+                                   ICacheManager cacheManager,
+                                   IEventAggregator eventAggregator)
+        {
+            _formatRepository = formatRepository;
+            _eventAggregator = eventAggregator;
+            _cache = cacheManager.GetCache<Dictionary<int, CustomFormat>>(typeof(CustomFormat), "formats");
+        }
+
+        private Dictionary<int, CustomFormat> AllDictionary()
+        {
+            return _cache.Get("all", () => _formatRepository.All().ToDictionary(m => m.Id));
+        }
+
+        public List<CustomFormat> All()
+        {
+            return AllDictionary().Values.ToList();
+        }
+
+        public CustomFormat GetById(int id)
+        {
+            return AllDictionary()[id];
+        }
+
+        public void Update(CustomFormat customFormat)
+        {
+            _formatRepository.Update(customFormat);
+            _cache.Clear();
+        }
+
+        public CustomFormat Insert(CustomFormat customFormat)
+        {
+            // Add to DB then insert into profiles
+            var result = _formatRepository.Insert(customFormat);
+            _cache.Clear();
+
+            _eventAggregator.PublishEvent(new CustomFormatAddedEvent(result));
+
+            return result;
+        }
+
+        public void Delete(int id)
+        {
+            var format = _formatRepository.Get(id);
+
+            // Remove from profiles before removing from DB
+            _eventAggregator.PublishEvent(new CustomFormatDeletedEvent(format));
+
+            _formatRepository.Delete(id);
+            _cache.Clear();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Events/CustomFormatAddedEvent.cs b/src/NzbDrone.Core/CustomFormats/Events/CustomFormatAddedEvent.cs
new file mode 100644
index 000000000..975d57105
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Events/CustomFormatAddedEvent.cs
@@ -0,0 +1,14 @@
+using NzbDrone.Common.Messaging;
+
+namespace NzbDrone.Core.CustomFormats.Events
+{
+    public class CustomFormatAddedEvent : IEvent
+    {
+        public CustomFormatAddedEvent(CustomFormat format)
+        {
+            CustomFormat = format;
+        }
+
+        public CustomFormat CustomFormat { get; private set; }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Events/CustomFormatDeletedEvent.cs b/src/NzbDrone.Core/CustomFormats/Events/CustomFormatDeletedEvent.cs
new file mode 100644
index 000000000..50991b1b1
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Events/CustomFormatDeletedEvent.cs
@@ -0,0 +1,14 @@
+using NzbDrone.Common.Messaging;
+
+namespace NzbDrone.Core.CustomFormats.Events
+{
+    public class CustomFormatDeletedEvent : IEvent
+    {
+        public CustomFormatDeletedEvent(CustomFormat format)
+        {
+            CustomFormat = format;
+        }
+
+        public CustomFormat CustomFormat { get; private set; }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs b/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs
new file mode 100644
index 000000000..e1389638f
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class SpecificationMatchesGroup
+    {
+        public Dictionary<ICustomFormatSpecification, bool> Matches { get; set; }
+
+        public bool DidMatch => !(Matches.Any(m => m.Key.Required && m.Value == false) ||
+                                  Matches.All(m => m.Value == false));
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs b/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs
new file mode 100644
index 000000000..af168e883
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs
@@ -0,0 +1,36 @@
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public abstract class CustomFormatSpecificationBase : ICustomFormatSpecification
+    {
+        public abstract int Order { get; }
+        public abstract string ImplementationName { get; }
+
+        public virtual string InfoLink => "https://wiki.servarr.com/sonarr/settings#custom-formats-2";
+
+        public string Name { get; set; }
+        public bool Negate { get; set; }
+        public bool Required { get; set; }
+
+        public ICustomFormatSpecification Clone()
+        {
+            return (ICustomFormatSpecification)MemberwiseClone();
+        }
+
+        public abstract NzbDroneValidationResult Validate();
+
+        public bool IsSatisfiedBy(CustomFormatInput input)
+        {
+            var match = IsSatisfiedByWithoutNegate(input);
+            if (Negate)
+            {
+                match = !match;
+            }
+
+            return match;
+        }
+
+        protected abstract bool IsSatisfiedByWithoutNegate(CustomFormatInput input);
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
new file mode 100644
index 000000000..1ccdff791
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
@@ -0,0 +1,20 @@
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public interface ICustomFormatSpecification
+    {
+        int Order { get; }
+        string InfoLink { get; }
+        string ImplementationName { get; }
+        string Name { get; set; }
+        bool Negate { get; set; }
+        bool Required { get; set; }
+
+        NzbDroneValidationResult Validate();
+
+        ICustomFormatSpecification Clone();
+        bool IsSatisfiedBy(CustomFormatInput input);
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs b/src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs
new file mode 100644
index 000000000..e548d858f
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs
@@ -0,0 +1,54 @@
+using System.Text.RegularExpressions;
+using FluentValidation;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class RegexSpecificationBaseValidator : AbstractValidator<RegexSpecificationBase>
+    {
+        public RegexSpecificationBaseValidator()
+        {
+            RuleFor(c => c.Value).NotEmpty().WithMessage("Regex Pattern must not be empty");
+        }
+    }
+
+    public abstract class RegexSpecificationBase : CustomFormatSpecificationBase
+    {
+        private static readonly RegexSpecificationBaseValidator Validator = new RegexSpecificationBaseValidator();
+
+        protected Regex _regex;
+        protected string _raw;
+
+        [FieldDefinition(1, Label = "Regular Expression", HelpText = "Custom Format RegEx is Case Insensitive")]
+        public string Value
+        {
+            get => _raw;
+            set
+            {
+                _raw = value;
+
+                if (value.IsNotNullOrWhiteSpace())
+                {
+                    _regex = new Regex(value, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+                }
+            }
+        }
+
+        protected bool MatchString(string compared)
+        {
+            if (compared == null || _regex == null)
+            {
+                return false;
+            }
+
+            return _regex.IsMatch(compared);
+        }
+
+        public override NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs
new file mode 100644
index 000000000..08e34cf3f
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs
@@ -0,0 +1,14 @@
+namespace NzbDrone.Core.CustomFormats
+{
+    public class ReleaseGroupSpecification : RegexSpecificationBase
+    {
+        public override int Order => 9;
+        public override string ImplementationName => "Release Group";
+        public override string InfoLink => "https://wiki.servarr.com/sonarr/settings#custom-formats-2";
+
+        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        {
+            return MatchString(input.AlbumInfo?.ReleaseGroup);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs
new file mode 100644
index 000000000..1209e2857
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs
@@ -0,0 +1,14 @@
+namespace NzbDrone.Core.CustomFormats
+{
+    public class ReleaseTitleSpecification : RegexSpecificationBase
+    {
+        public override int Order => 1;
+        public override string ImplementationName => "Release Title";
+        public override string InfoLink => "https://wiki.servarr.com/sonarr/settings#custom-formats-2";
+
+        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        {
+            return MatchString(input.AlbumInfo?.ReleaseTitle) || MatchString(input.Filename);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
new file mode 100644
index 000000000..257904a30
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
@@ -0,0 +1,41 @@
+using FluentValidation;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class SizeSpecificationValidator : AbstractValidator<SizeSpecification>
+    {
+        public SizeSpecificationValidator()
+        {
+            RuleFor(c => c.Min).GreaterThanOrEqualTo(0);
+            RuleFor(c => c.Max).GreaterThan(c => c.Min);
+        }
+    }
+
+    public class SizeSpecification : CustomFormatSpecificationBase
+    {
+        private static readonly SizeSpecificationValidator Validator = new SizeSpecificationValidator();
+
+        public override int Order => 8;
+        public override string ImplementationName => "Size";
+
+        [FieldDefinition(1, Label = "Minimum Size", HelpText = "Release must be greater than this size", Unit = "GB", Type = FieldType.Number)]
+        public double Min { get; set; }
+
+        [FieldDefinition(1, Label = "Maximum Size", HelpText = "Release must be less than or equal to this size", Unit = "GB", Type = FieldType.Number)]
+        public double Max { get; set; }
+
+        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        {
+            var size = input.Size;
+
+            return size > Min.Gigabytes() && size <= Max.Gigabytes();
+        }
+
+        public override NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Converters/CustomFormatIntConverter.cs b/src/NzbDrone.Core/Datastore/Converters/CustomFormatIntConverter.cs
new file mode 100644
index 000000000..d5ca9d989
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Converters/CustomFormatIntConverter.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using NzbDrone.Core.CustomFormats;
+
+namespace NzbDrone.Core.Datastore.Converters
+{
+    public class CustomFormatIntConverter : JsonConverter<CustomFormat>
+    {
+        public override CustomFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new CustomFormat { Id = reader.GetInt32() };
+        }
+
+        public override void Write(Utf8JsonWriter writer, CustomFormat value, JsonSerializerOptions options)
+        {
+            writer.WriteNumberValue(value.Id);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs b/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs
new file mode 100644
index 000000000..509f376a7
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using NzbDrone.Core.CustomFormats;
+
+namespace NzbDrone.Core.Datastore.Converters
+{
+    public class CustomFormatSpecificationListConverter : JsonConverter<List<ICustomFormatSpecification>>
+    {
+        public override void Write(Utf8JsonWriter writer, List<ICustomFormatSpecification> value, JsonSerializerOptions options)
+        {
+            var wrapped = value.Select(x => new SpecificationWrapper
+            {
+                Type = x.GetType().Name,
+                Body = x
+            });
+
+            JsonSerializer.Serialize(writer, wrapped, options);
+        }
+
+        public override List<ICustomFormatSpecification> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            ValidateToken(reader, JsonTokenType.StartArray);
+
+            var results = new List<ICustomFormatSpecification>();
+
+            reader.Read(); // Advance to the first object after the StartArray token. This should be either a StartObject token, or the EndArray token. Anything else is invalid.
+
+            while (reader.TokenType == JsonTokenType.StartObject)
+            {
+                reader.Read(); // Move to type property name
+                ValidateToken(reader, JsonTokenType.PropertyName);
+
+                reader.Read(); // Move to type property value
+                ValidateToken(reader, JsonTokenType.String);
+                var typename = reader.GetString();
+
+                reader.Read(); // Move to body property name
+                ValidateToken(reader, JsonTokenType.PropertyName);
+
+                reader.Read(); // Move to start of object (stored in this property)
+                ValidateToken(reader, JsonTokenType.StartObject); // Start of formattag
+
+                var type = Type.GetType($"NzbDrone.Core.CustomFormats.{typename}, Lidarr.Core", true);
+                var item = (ICustomFormatSpecification)JsonSerializer.Deserialize(ref reader, type, options);
+                results.Add(item);
+
+                reader.Read(); // Move past end of body object
+                reader.Read(); // Move past end of 'wrapper' object
+            }
+
+            ValidateToken(reader, JsonTokenType.EndArray);
+
+            return results;
+        }
+
+        // Helper function for validating where you are in the JSON
+        private void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
+        {
+            if (reader.TokenType != tokenType)
+            {
+                throw new JsonException($"Invalid token: Was expecting a '{tokenType}' token but received a '{reader.TokenType}' token");
+            }
+        }
+
+        private class SpecificationWrapper
+        {
+            public string Type { get; set; }
+            public object Body { get; set; }
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Migration/063_add_custom_formats.cs b/src/NzbDrone.Core/Datastore/Migration/063_add_custom_formats.cs
new file mode 100644
index 000000000..ad7446851
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/063_add_custom_formats.cs
@@ -0,0 +1,307 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Dapper;
+using FluentMigrator;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(063)]
+    public class add_custom_formats : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("DelayProfiles").AddColumn("BypassIfHighestQuality").AsBoolean().WithDefaultValue(false);
+
+            // Set to true for existing Delay Profiles to keep behavior the same.
+            Update.Table("DelayProfiles").Set(new { BypassIfHighestQuality = true }).AllRows();
+
+            Alter.Table("TrackFiles").AddColumn("OriginalFilePath").AsString().Nullable();
+
+            Execute.WithConnection(ChangeRequiredIgnoredTypes);
+
+            // Add Custom Format Columns
+            Create.TableForModel("CustomFormats")
+                .WithColumn("Name").AsString().Unique()
+                .WithColumn("Specifications").AsString().WithDefaultValue("[]")
+                .WithColumn("IncludeCustomFormatWhenRenaming").AsBoolean().WithDefaultValue(false);
+
+            // Add Custom Format Columns to Quality Profiles
+            Alter.Table("QualityProfiles").AddColumn("FormatItems").AsString().WithDefaultValue("[]");
+            Alter.Table("QualityProfiles").AddColumn("MinFormatScore").AsInt32().WithDefaultValue(0);
+            Alter.Table("QualityProfiles").AddColumn("CutoffFormatScore").AsInt32().WithDefaultValue(0);
+
+            // Migrate Preferred Words to Custom Formats
+            Execute.WithConnection(MigratePreferredTerms);
+            Execute.WithConnection(MigrateNamingConfigs);
+
+            // Remove Preferred Word Columns from ReleaseProfiles
+            Delete.Column("Preferred").FromTable("ReleaseProfiles");
+            Delete.Column("IncludePreferredWhenRenaming").FromTable("ReleaseProfiles");
+
+            // Remove Profiles that will no longer validate
+            Execute.Sql("DELETE FROM \"ReleaseProfiles\" WHERE \"Required\" = '[]' AND \"Ignored\" = '[]'");
+
+            Alter.Table("DelayProfiles").AddColumn("BypassIfAboveCustomFormatScore").AsBoolean().WithDefaultValue(false);
+            Alter.Table("DelayProfiles").AddColumn("MinimumCustomFormatScore").AsInt32().Nullable();
+        }
+
+        private void ChangeRequiredIgnoredTypes(IDbConnection conn, IDbTransaction tran)
+        {
+            var updatedProfiles = new List<object>();
+
+            using (var getEmailCmd = conn.CreateCommand())
+            {
+                getEmailCmd.Transaction = tran;
+                getEmailCmd.CommandText = "SELECT \"Id\", \"Required\", \"Ignored\" FROM \"ReleaseProfiles\"";
+
+                using (var reader = getEmailCmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        var id = reader.GetInt32(0);
+                        var requiredObj = reader.GetValue(1);
+                        var ignoredObj = reader.GetValue(2);
+
+                        var required = requiredObj == DBNull.Value
+                            ? Enumerable.Empty<string>()
+                            : requiredObj.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+                        var ignored = ignoredObj == DBNull.Value
+                            ? Enumerable.Empty<string>()
+                            : ignoredObj.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+                        updatedProfiles.Add(new
+                        {
+                            Id = id,
+                            Required = required.ToJson(),
+                            Ignored = ignored.ToJson()
+                        });
+                    }
+                }
+            }
+
+            var updateProfileSql = "UPDATE \"ReleaseProfiles\" SET \"Required\" = @Required, \"Ignored\" = @Ignored WHERE \"Id\" = @Id";
+            conn.Execute(updateProfileSql, updatedProfiles, transaction: tran);
+        }
+
+        private void MigratePreferredTerms(IDbConnection conn, IDbTransaction tran)
+        {
+            var updatedCollections = new List<CustomFormat057>();
+
+            // Pull list of quality Profiles
+            var qualityProfiles = new List<QualityProfile057>();
+            using (var getProfiles = conn.CreateCommand())
+            {
+                getProfiles.Transaction = tran;
+                getProfiles.CommandText = @"SELECT ""Id"" FROM ""QualityProfiles""";
+
+                using (var definitionsReader = getProfiles.ExecuteReader())
+                {
+                    while (definitionsReader.Read())
+                    {
+                        var id = definitionsReader.GetInt32(0);
+                        qualityProfiles.Add(new QualityProfile057
+                        {
+                            Id = id,
+                        });
+                    }
+                }
+            }
+
+            // Generate List of Custom Formats from Preferred Words
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.Transaction = tran;
+                cmd.CommandText = "SELECT \"Preferred\", \"IncludePreferredWhenRenaming\", \"Enabled\", \"Id\" FROM \"ReleaseProfiles\" WHERE \"Preferred\" IS NOT NULL";
+
+                using (var reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        var preferred = reader.GetString(0);
+                        var includeName = reader.GetBoolean(1);
+                        var enabled = reader.GetBoolean(2);
+                        var releaseProfileId = reader.GetInt32(3);
+
+                        string name = null;
+
+                        if (name.IsNullOrWhiteSpace())
+                        {
+                            name = $"Unnamed_{releaseProfileId}";
+                        }
+                        else
+                        {
+                            name = $"{name}_{releaseProfileId}";
+                        }
+
+                        var data = STJson.Deserialize<List<PreferredWord056>>(preferred);
+
+                        var specs = new List<CustomFormatSpec057>();
+
+                        var nameIdentifier = 0;
+
+                        foreach (var term in data)
+                        {
+                            var regexTerm = term.Key.TrimStart('/').TrimEnd("/i");
+
+                            // Validate Regex before creating a CF
+                            try
+                            {
+                                Regex.Match("", regexTerm);
+                            }
+                            catch (ArgumentException)
+                            {
+                                continue;
+                            }
+
+                            updatedCollections.Add(new CustomFormat057
+                            {
+                                Name = data.Count > 1 ? $"{name}_{nameIdentifier++}" : name,
+                                PreferredName = name,
+                                IncludeCustomFormatWhenRenaming = includeName,
+                                Score = term.Value,
+                                Enabled = enabled,
+                                Specifications = new List<CustomFormatSpec057>
+                                {
+                                    new CustomFormatSpec057
+                                    {
+                                        Type = "ReleaseTitleSpecification",
+                                        Body = new CustomFormatReleaseTitleSpec057
+                                        {
+                                            Order = 1,
+                                            ImplementationName = "Release Title",
+                                            Name = regexTerm,
+                                            Value = regexTerm
+                                        }
+                                    }
+                                }.ToJson()
+                            });
+                        }
+                    }
+                }
+            }
+
+            // Insert Custom Formats
+            var updateSql = "INSERT INTO \"CustomFormats\" (\"Name\", \"IncludeCustomFormatWhenRenaming\", \"Specifications\") VALUES (@Name, @IncludeCustomFormatWhenRenaming, @Specifications)";
+            conn.Execute(updateSql, updatedCollections, transaction: tran);
+
+            // Pull List of Custom Formats with new Ids
+            var formats = new List<CustomFormat057>();
+            using (var getProfiles = conn.CreateCommand())
+            {
+                getProfiles.Transaction = tran;
+                getProfiles.CommandText = @"SELECT ""Id"", ""Name"" FROM ""CustomFormats""";
+
+                using (var definitionsReader = getProfiles.ExecuteReader())
+                {
+                    while (definitionsReader.Read())
+                    {
+                        var id = definitionsReader.GetInt32(0);
+                        var name = definitionsReader.GetString(1);
+                        formats.Add(new CustomFormat057
+                        {
+                            Id = id,
+                            Name = name
+                        });
+                    }
+                }
+            }
+
+            // Update each profile with original scores
+            foreach (var profile in qualityProfiles)
+            {
+                profile.FormatItems = formats.Select(x => new { Format = x.Id, Score = updatedCollections.First(f => f.Name == x.Name).Enabled ? updatedCollections.First(f => f.Name == x.Name).Score : 0 }).ToJson();
+            }
+
+            // Push profile updates to DB
+            var updateProfilesSql = "UPDATE \"QualityProfiles\" SET \"FormatItems\" = @FormatItems WHERE \"Id\" = @Id";
+            conn.Execute(updateProfilesSql, qualityProfiles, transaction: tran);
+        }
+
+        private void MigrateNamingConfigs(IDbConnection conn, IDbTransaction tran)
+        {
+            var updatedNamingConfigs = new List<object>();
+
+            using (IDbCommand namingConfigCmd = conn.CreateCommand())
+            {
+                namingConfigCmd.Transaction = tran;
+                namingConfigCmd.CommandText = @"SELECT * FROM ""NamingConfig"" LIMIT 1";
+                using (IDataReader namingConfigReader = namingConfigCmd.ExecuteReader())
+                {
+                    var standardTrackFormatIndex = namingConfigReader.GetOrdinal("StandardTrackFormat");
+                    var multiDiscTrackFormatIndex = namingConfigReader.GetOrdinal("MultiDiscTrackFormat");
+
+                    while (namingConfigReader.Read())
+                    {
+                        var standardTrackFormat = NameReplace(namingConfigReader.GetString(standardTrackFormatIndex));
+                        var multiDiscTrackFormat = NameReplace(namingConfigReader.GetString(multiDiscTrackFormatIndex));
+
+                        updatedNamingConfigs.Add(new
+                        {
+                            StandardTrackFormat = standardTrackFormat,
+                            MultiDiscTrackFormat = multiDiscTrackFormat
+                        });
+                    }
+                }
+            }
+
+            var updateProfileSql = "UPDATE \"NamingConfig\" SET \"StandardTrackFormat\" = @StandardTrackFormat, \"MultiDiscTrackFormat\" = @MultiDiscTrackFormat";
+            conn.Execute(updateProfileSql, updatedNamingConfigs, transaction: tran);
+        }
+
+        private string NameReplace(string oldTokenString)
+        {
+            var newTokenString = oldTokenString.Replace("Preferred Words", "Custom Formats")
+                                               .Replace("Preferred.Words", "Custom.Formats")
+                                               .Replace("Preferred-Words", "Custom-Formats")
+                                               .Replace("Preferred_Words", "Custom_Formats");
+
+            return newTokenString;
+        }
+
+        private class PreferredWord056
+        {
+            public string Key { get; set; }
+            public int Value { get; set; }
+        }
+
+        private class QualityProfile057
+        {
+            public int Id { get; set; }
+            public string FormatItems { get; set; }
+        }
+
+        private class CustomFormat057
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+            public string PreferredName { get; set; }
+            public bool IncludeCustomFormatWhenRenaming { get; set; }
+            public string Specifications { get; set; }
+            public int Score { get; set; }
+            public bool Enabled { get; set; }
+        }
+
+        private class CustomFormatSpec057
+        {
+            public string Type { get; set; }
+            public CustomFormatReleaseTitleSpec057 Body { get; set; }
+        }
+
+        private class CustomFormatReleaseTitleSpec057
+        {
+            public int Order { get; set; }
+            public string ImplementationName { get; set; }
+            public string Name { get; set; }
+            public string Value { get; set; }
+            public bool Required { get; set; }
+            public bool Negate { get; set; }
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index 346f2c37e..b437e5994 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -7,6 +7,7 @@ using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.CustomFilters;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.History;
@@ -27,6 +28,7 @@ using NzbDrone.Core.Music;
 using NzbDrone.Core.Notifications;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Profiles.Delay;
 using NzbDrone.Core.Profiles.Metadata;
 using NzbDrone.Core.Profiles.Qualities;
@@ -166,6 +168,8 @@ namespace NzbDrone.Core.Datastore
                   .Ignore(d => d.GroupWeight)
                   .Ignore(d => d.Weight);
 
+            Mapper.Entity<CustomFormat>("CustomFormats").RegisterModel();
+
             Mapper.Entity<QualityProfile>("QualityProfiles").RegisterModel();
             Mapper.Entity<MetadataProfile>("MetadataProfiles").RegisterModel();
             Mapper.Entity<Log>("Logs").RegisterModel();
@@ -209,6 +213,8 @@ namespace NzbDrone.Core.Datastore
             SqlMapper.AddTypeHandler(new DapperTimeSpanConverter());
             SqlMapper.AddTypeHandler(new DapperQualityIntConverter());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<QualityProfileQualityItem>>(new QualityIntConverter()));
+            SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<ProfileFormatItem>>(new CustomFormatIntConverter()));
+            SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<ICustomFormatSpecification>>(new CustomFormatSpecificationListConverter()));
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<QualityModel>(new QualityIntConverter()));
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<Dictionary<string, string>>());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<IDictionary<string, string>>());
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
index c310a3223..40bf551ce 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
@@ -28,7 +28,7 @@ namespace NzbDrone.Core.DecisionEngine
             var comparers = new List<CompareDelegate>
             {
                 CompareQuality,
-                ComparePreferredWordScore,
+                CompareCustomFormatScore,
                 CompareProtocol,
                 CompareIndexerPriority,
                 ComparePeersIfTorrent,
@@ -76,9 +76,9 @@ namespace NzbDrone.Core.DecisionEngine
                            CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.ParsedAlbumInfo.Quality.Revision));
         }
 
-        private int ComparePreferredWordScore(DownloadDecision x, DownloadDecision y)
+        private int CompareCustomFormatScore(DownloadDecision x, DownloadDecision y)
         {
-            return CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.PreferredWordScore);
+            return CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.CustomFormatScore);
         }
 
         private int CompareProtocol(DownloadDecision x, DownloadDecision y)
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
index 1bcdcfcbf..2db68aeb1 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
@@ -5,6 +5,7 @@ using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Common.Serializer;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Download.Aggregation;
 using NzbDrone.Core.IndexerSearch.Definitions;
@@ -22,17 +23,20 @@ namespace NzbDrone.Core.DecisionEngine
     public class DownloadDecisionMaker : IMakeDownloadDecision
     {
         private readonly IEnumerable<IDecisionEngineSpecification> _specifications;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly IParsingService _parsingService;
         private readonly IRemoteAlbumAggregationService _aggregationService;
         private readonly Logger _logger;
 
         public DownloadDecisionMaker(IEnumerable<IDecisionEngineSpecification> specifications,
             IParsingService parsingService,
+            ICustomFormatCalculationService formatService,
             IRemoteAlbumAggregationService aggregationService,
             Logger logger)
         {
             _specifications = specifications;
             _parsingService = parsingService;
+            _formatCalculator = formatService;
             _aggregationService = aggregationService;
             _logger = logger;
         }
@@ -77,68 +81,57 @@ namespace NzbDrone.Core.DecisionEngine
                             searchCriteria.Albums);
                     }
 
-                    if (parsedAlbumInfo != null)
+                    if (parsedAlbumInfo != null && !parsedAlbumInfo.ArtistName.IsNullOrWhiteSpace())
                     {
-                        // TODO: Artist Data Augment without calling to parse title again
-                        // if (!report.Artist.IsNullOrWhiteSpace())
-                        // {
-                        //    if (parsedAlbumInfo.ArtistName.IsNullOrWhiteSpace() || _parsingService.GetArtist(parsedAlbumInfo.ArtistName) == null)
-                        //    {
-                        //        parsedAlbumInfo.ArtistName = report.Artist;
-                        //    }
-                        // }
-
-                        // TODO: Replace Parsed AlbumTitle with metadata Title if Parsed AlbumTitle not a valid match
-                        // if (!report.Album.IsNullOrWhiteSpace())
-                        // {
-                        //    parsedAlbumInfo.AlbumTitle = report.Album;
-                        // }
-                        if (!parsedAlbumInfo.ArtistName.IsNullOrWhiteSpace())
+                        var remoteAlbum = _parsingService.Map(parsedAlbumInfo, searchCriteria);
+                        remoteAlbum.Release = report;
+
+                        _aggregationService.Augment(remoteAlbum);
+
+                        remoteAlbum.CustomFormats = _formatCalculator.ParseCustomFormat(remoteAlbum, remoteAlbum.Release.Size);
+                        remoteAlbum.CustomFormatScore = remoteAlbum?.Artist?.QualityProfile?.Value.CalculateCustomFormatScore(remoteAlbum.CustomFormats) ?? 0;
+
+                        // try parsing again using the search criteria, in case it parsed but parsed incorrectly
+                        if ((remoteAlbum.Artist == null || remoteAlbum.Albums.Empty()) && searchCriteria != null)
                         {
-                            var remoteAlbum = _parsingService.Map(parsedAlbumInfo, searchCriteria);
+                            _logger.Debug("Artist/Album null for {0}, reparsing with search criteria", report.Title);
+                            var parsedAlbumInfoWithCriteria = Parser.Parser.ParseAlbumTitleWithSearchCriteria(report.Title,
+                                                                                                                searchCriteria.Artist,
+                                                                                                                searchCriteria.Albums);
 
-                            // try parsing again using the search criteria, in case it parsed but parsed incorrectly
-                            if ((remoteAlbum.Artist == null || remoteAlbum.Albums.Empty()) && searchCriteria != null)
+                            if (parsedAlbumInfoWithCriteria != null && parsedAlbumInfoWithCriteria.ArtistName.IsNotNullOrWhiteSpace())
                             {
-                                _logger.Debug("Artist/Album null for {0}, reparsing with search criteria", report.Title);
-                                var parsedAlbumInfoWithCriteria = Parser.Parser.ParseAlbumTitleWithSearchCriteria(report.Title,
-                                                                                                                  searchCriteria.Artist,
-                                                                                                                  searchCriteria.Albums);
-
-                                if (parsedAlbumInfoWithCriteria != null && parsedAlbumInfoWithCriteria.ArtistName.IsNotNullOrWhiteSpace())
-                                {
-                                    remoteAlbum = _parsingService.Map(parsedAlbumInfoWithCriteria, searchCriteria);
-                                }
+                                remoteAlbum = _parsingService.Map(parsedAlbumInfoWithCriteria, searchCriteria);
                             }
+                        }
 
-                            remoteAlbum.Release = report;
+                        remoteAlbum.Release = report;
 
-                            if (remoteAlbum.Artist == null)
-                            {
-                                decision = new DownloadDecision(remoteAlbum, new Rejection("Unknown Artist"));
-
-                                // shove in the searched artist in case of forced download in interactive search
-                                if (searchCriteria != null)
-                                {
-                                    remoteAlbum.Artist = searchCriteria.Artist;
-                                    remoteAlbum.Albums = searchCriteria.Albums;
-                                }
-                            }
-                            else if (remoteAlbum.Albums.Empty())
+                        if (remoteAlbum.Artist == null)
+                        {
+                            decision = new DownloadDecision(remoteAlbum, new Rejection("Unknown Artist"));
+
+                            // shove in the searched artist in case of forced download in interactive search
+                            if (searchCriteria != null)
                             {
-                                decision = new DownloadDecision(remoteAlbum, new Rejection("Unable to parse albums from release name"));
-                                if (searchCriteria != null)
-                                {
-                                    remoteAlbum.Albums = searchCriteria.Albums;
-                                }
+                                remoteAlbum.Artist = searchCriteria.Artist;
+                                remoteAlbum.Albums = searchCriteria.Albums;
                             }
-                            else
+                        }
+                        else if (remoteAlbum.Albums.Empty())
+                        {
+                            decision = new DownloadDecision(remoteAlbum, new Rejection("Unable to parse albums from release name"));
+                            if (searchCriteria != null)
                             {
-                                _aggregationService.Augment(remoteAlbum);
-                                remoteAlbum.DownloadAllowed = remoteAlbum.Albums.Any();
-                                decision = GetDecisionForReport(remoteAlbum, searchCriteria);
+                                remoteAlbum.Albums = searchCriteria.Albums;
                             }
                         }
+                        else
+                        {
+                            _aggregationService.Augment(remoteAlbum);
+                            remoteAlbum.DownloadAllowed = remoteAlbum.Albums.Any();
+                            decision = GetDecisionForReport(remoteAlbum, searchCriteria);
+                        }
                     }
 
                     if (searchCriteria != null)
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CustomFormatAllowedByProfileSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CustomFormatAllowedByProfileSpecification.cs
new file mode 100644
index 000000000..129c8c022
--- /dev/null
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CustomFormatAllowedByProfileSpecification.cs
@@ -0,0 +1,25 @@
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.DecisionEngine.Specifications
+{
+    public class CustomFormatAllowedbyProfileSpecification : IDecisionEngineSpecification
+    {
+        public SpecificationPriority Priority => SpecificationPriority.Default;
+        public RejectionType Type => RejectionType.Permanent;
+
+        public virtual Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
+        {
+            var minScore = subject.Artist.QualityProfile.Value.MinFormatScore;
+            var score = subject.CustomFormatScore;
+
+            if (score < minScore)
+            {
+                return Decision.Reject("Custom Formats {0} have score {1} below Artist profile minimum {2}", subject.CustomFormats.ConcatToString(), score, minScore);
+            }
+
+            return Decision.Accept();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
index 4bd5c7089..b568cba11 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
@@ -16,22 +17,22 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         private readonly UpgradableSpecification _upgradableSpecification;
         private readonly IMediaFileService _mediaFileService;
         private readonly ITrackService _trackService;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly Logger _logger;
         private readonly ICached<bool> _missingFilesCache;
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
 
         public CutoffSpecification(UpgradableSpecification upgradableSpecification,
                                    Logger logger,
                                    ICacheManager cacheManager,
                                    IMediaFileService mediaFileService,
-                                   IPreferredWordService preferredWordServiceCalculator,
+                                   ICustomFormatCalculationService formatService,
                                    ITrackService trackService)
         {
             _upgradableSpecification = upgradableSpecification;
             _mediaFileService = mediaFileService;
             _trackService = trackService;
             _missingFilesCache = cacheManager.GetCache<bool>(GetType());
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
+            _formatService = formatService;
             _logger = logger;
         }
 
@@ -56,11 +57,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
                     _logger.Debug("Comparing file quality with report. Existing files contain {0}", currentQualities.ConcatToString());
 
+                    var customFormats = _formatService.ParseCustomFormat(trackFiles[0]);
+
                     if (!_upgradableSpecification.CutoffNotMet(qualityProfile,
                                                                currentQualities,
-                                                               _preferredWordServiceCalculator.Calculate(subject.Artist, trackFiles[0].GetSceneOrFileName(), subject.Release.IndexerId),
-                                                               subject.ParsedAlbumInfo.Quality,
-                                                               subject.PreferredWordScore))
+                                                               customFormats,
+                                                               subject.ParsedAlbumInfo.Quality))
                     {
                         _logger.Debug("Cutoff already met by existing files, rejecting.");
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
index f904f8933..d0e4ece3a 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
@@ -14,17 +15,17 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
     {
         private readonly IQueueService _queueService;
         private readonly UpgradableSpecification _upgradableSpecification;
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly Logger _logger;
 
         public QueueSpecification(IQueueService queueService,
-                                       UpgradableSpecification upgradableSpecification,
-                                       IPreferredWordService preferredWordServiceCalculator,
-                                       Logger logger)
+                                  UpgradableSpecification upgradableSpecification,
+                                  ICustomFormatCalculationService formatService,
+                                  Logger logger)
         {
             _queueService = queueService;
             _upgradableSpecification = upgradableSpecification;
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
+            _formatService = formatService;
             _logger = logger;
         }
 
@@ -52,15 +53,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                     continue;
                 }
 
-                _logger.Debug("Checking if existing release in queue meets cutoff. Queued quality is: {0}", remoteAlbum.ParsedAlbumInfo.Quality);
+                var queuedItemCustomFormats = _formatService.ParseCustomFormat(remoteAlbum, (long)queueItem.Size);
 
-                var queuedItemPreferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Artist, queueItem.Title, subject.Release?.IndexerId ?? 0);
+                _logger.Debug("Checking if existing release in queue meets cutoff. Queued quality is: {0}", remoteAlbum.ParsedAlbumInfo.Quality);
 
                 if (!_upgradableSpecification.CutoffNotMet(qualityProfile,
                                                            new List<QualityModel> { remoteAlbum.ParsedAlbumInfo.Quality },
-                                                           queuedItemPreferredWordScore,
-                                                           subject.ParsedAlbumInfo.Quality,
-                                                           subject.PreferredWordScore))
+                                                           queuedItemCustomFormats,
+                                                           subject.ParsedAlbumInfo.Quality))
                 {
                     return Decision.Reject("Release in queue already meets cutoff: {0}", remoteAlbum.ParsedAlbumInfo.Quality);
                 }
@@ -69,9 +69,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
                 if (!_upgradableSpecification.IsUpgradable(qualityProfile,
                                                            new List<QualityModel> { remoteAlbum.ParsedAlbumInfo.Quality },
-                                                           queuedItemPreferredWordScore,
+                                                           queuedItemCustomFormats,
                                                            subject.ParsedAlbumInfo.Quality,
-                                                           subject.PreferredWordScore))
+                                                           subject.CustomFormats))
                 {
                     return Decision.Reject("Release in queue is of equal or higher preference: {0}", remoteAlbum.ParsedAlbumInfo.Quality);
                 }
@@ -80,7 +80,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
                 if (!_upgradableSpecification.IsUpgradeAllowed(qualityProfile,
                                                                new List<QualityModel> { remoteAlbum.ParsedAlbumInfo.Quality },
-                                                               subject.ParsedAlbumInfo.Quality))
+                                                               queuedItemCustomFormats,
+                                                               subject.ParsedAlbumInfo.Quality,
+                                                               subject.CustomFormats))
                 {
                     return Decision.Reject("Another release is queued and the Quality profile does not allow upgrades");
                 }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
index e134699a8..6096942a1 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
@@ -32,12 +32,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             var title = subject.Release.Title;
             var releaseProfiles = _releaseProfileService.EnabledForTags(subject.Artist.Tags, subject.Release.IndexerId);
 
-            var required = releaseProfiles.Where(r => r.Required.IsNotNullOrWhiteSpace());
-            var ignored = releaseProfiles.Where(r => r.Ignored.IsNotNullOrWhiteSpace());
+            var required = releaseProfiles.Where(r => r.Required.Any());
+            var ignored = releaseProfiles.Where(r => r.Ignored.Any());
 
             foreach (var r in required)
             {
-                var requiredTerms = r.Required.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+                var requiredTerms = r.Required;
 
                 var foundTerms = ContainsAny(requiredTerms, title);
                 if (foundTerms.Empty())
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
             foreach (var r in ignored)
             {
-                var ignoredTerms = r.Ignored.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+                var ignoredTerms = r.Ignored;
 
                 var foundTerms = ContainsAny(ignoredTerms, title);
                 if (foundTerms.Any())
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
index 8cbeba4d8..ff6ecbf63 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
@@ -5,7 +5,6 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Delay;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
@@ -16,21 +15,18 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
         private readonly IUpgradableSpecification _upgradableSpecification;
         private readonly IDelayProfileService _delayProfileService;
         private readonly IMediaFileService _mediaFileService;
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
         private readonly Logger _logger;
 
         public DelaySpecification(IPendingReleaseService pendingReleaseService,
                                   IUpgradableSpecification qualityUpgradableSpecification,
                                   IDelayProfileService delayProfileService,
                                   IMediaFileService mediaFileService,
-                                  IPreferredWordService preferredWordServiceCalculator,
                                   Logger logger)
         {
             _pendingReleaseService = pendingReleaseService;
             _upgradableSpecification = qualityUpgradableSpecification;
             _delayProfileService = delayProfileService;
             _mediaFileService = mediaFileService;
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
             _logger = logger;
         }
 
@@ -80,13 +76,29 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
             }
 
             // If quality meets or exceeds the best allowed quality in the profile accept it immediately
-            var bestQualityInProfile = qualityProfile.LastAllowedQuality();
-            var isBestInProfile = qualityComparer.Compare(subject.ParsedAlbumInfo.Quality.Quality, bestQualityInProfile) >= 0;
-
-            if (isBestInProfile && isPreferredProtocol)
+            if (delayProfile.BypassIfHighestQuality)
             {
+                var bestQualityInProfile = qualityProfile.LastAllowedQuality();
+                var isBestInProfile = qualityComparer.Compare(subject.ParsedAlbumInfo.Quality.Quality, bestQualityInProfile) >= 0;
+
+                if (isBestInProfile && isPreferredProtocol)
+                {
                 _logger.Debug("Quality is highest in profile for preferred protocol, will not delay");
                 return Decision.Accept();
+                }
+            }
+
+            // If quality meets or exceeds the best allowed quality in the profile accept it immediately
+            if (delayProfile.BypassIfAboveCustomFormatScore)
+            {
+                var score = subject.CustomFormatScore;
+                var minimum = delayProfile.MinimumCustomFormatScore;
+
+                if (score >= minimum && isPreferredProtocol)
+                {
+                    _logger.Debug("Custom format score ({0}) meets minimum ({1}) for preferred protocol, will not delay", score, minimum);
+                    return Decision.Accept();
+                }
             }
 
             var albumIds = subject.Albums.Select(e => e.Id);
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
index 655a12c9b..27715627f 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.History;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
@@ -15,20 +16,20 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
     {
         private readonly IHistoryService _historyService;
         private readonly UpgradableSpecification _upgradableSpecification;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly IConfigService _configService;
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
         private readonly Logger _logger;
 
         public HistorySpecification(IHistoryService historyService,
-                                           UpgradableSpecification qualityUpgradableSpecification,
-                                           IConfigService configService,
-                                           IPreferredWordService preferredWordServiceCalculator,
-                                           Logger logger)
+                                    UpgradableSpecification upgradableSpecification,
+                                    ICustomFormatCalculationService formatService,
+                                    IConfigService configService,
+                                    Logger logger)
         {
             _historyService = historyService;
-            _upgradableSpecification = qualityUpgradableSpecification;
+            _upgradableSpecification = upgradableSpecification;
+            _formatService = formatService;
             _configService = configService;
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
             _logger = logger;
         }
 
@@ -60,23 +61,22 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                         continue;
                     }
 
-                    // The artist will be the same as the one in history since it's the same album.
-                    // Instead of fetching the artist from the DB reuse the known artist.
-                    var preferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Artist, mostRecent.SourceTitle, subject.Release?.IndexerId ?? 0);
+                    var customFormats = _formatService.ParseCustomFormat(mostRecent, subject.Artist);
 
+                    // The series will be the same as the one in history since it's the same episode.
+                    // Instead of fetching the series from the DB reuse the known series.
                     var cutoffUnmet = _upgradableSpecification.CutoffNotMet(
                         subject.Artist.QualityProfile,
                         new List<QualityModel> { mostRecent.Quality },
-                        preferredWordScore,
-                        subject.ParsedAlbumInfo.Quality,
-                        subject.PreferredWordScore);
+                        customFormats,
+                        subject.ParsedAlbumInfo.Quality);
 
                     var upgradeable = _upgradableSpecification.IsUpgradable(
                         subject.Artist.QualityProfile,
                         new List<QualityModel> { mostRecent.Quality },
-                        preferredWordScore,
+                        customFormats,
                         subject.ParsedAlbumInfo.Quality,
-                        subject.PreferredWordScore);
+                        subject.CustomFormats);
 
                     if (!cutoffUnmet)
                     {
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
index aa687be9a..c3ca140cf 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
 
@@ -9,11 +11,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 {
     public interface IUpgradableSpecification
     {
-        bool IsUpgradable(QualityProfile profile, List<QualityModel> currentQualities, int currentScore, QualityModel newQuality, int newScore);
+        bool IsUpgradable(QualityProfile profile, List<QualityModel> currentQualities, List<CustomFormat> currentCustomFormats, QualityModel newQuality, List<CustomFormat> newCustomFormats);
         bool QualityCutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null);
-        bool CutoffNotMet(QualityProfile profile, List<QualityModel> currentQualities, int currentScore, QualityModel newQuality = null, int newScore = 0);
+        bool CutoffNotMet(QualityProfile profile, List<QualityModel> currentQualities, List<CustomFormat> currentFormats, QualityModel newQuality = null);
         bool IsRevisionUpgrade(QualityModel currentQuality, QualityModel newQuality);
-        bool IsUpgradeAllowed(QualityProfile qualityProfile, List<QualityModel> currentQualities, QualityModel newQuality);
+        bool IsUpgradeAllowed(QualityProfile qualityProfile, List<QualityModel> currentQualities, List<CustomFormat> currentCustomFormats, QualityModel newQuality, List<CustomFormat> newCustomFormats);
     }
 
     public class UpgradableSpecification : IUpgradableSpecification
@@ -63,14 +65,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             return ProfileComparisonResult.Upgrade;
         }
 
-        private bool IsPreferredWordUpgradable(int currentScore, int newScore)
-        {
-            _logger.Debug("Comparing preferred word score. Current: {0} New: {1}", currentScore, newScore);
-
-            return newScore > currentScore;
-        }
-
-        public bool IsUpgradable(QualityProfile qualityProfile, List<QualityModel> currentQualities, int currentScore, QualityModel newQuality, int newScore)
+        public bool IsUpgradable(QualityProfile qualityProfile, List<QualityModel> currentQualities, List<CustomFormat> currentCustomFormats, QualityModel newQuality, List<CustomFormat> newCustomFormats)
         {
             var qualityUpgrade = IsQualityUpgradable(qualityProfile, currentQualities, newQuality);
 
@@ -86,13 +81,19 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 return false;
             }
 
-            if (!IsPreferredWordUpgradable(currentScore, newScore))
+            var currentFormatScore = qualityProfile.CalculateCustomFormatScore(currentCustomFormats);
+            var newFormatScore = qualityProfile.CalculateCustomFormatScore(newCustomFormats);
+
+            if (newFormatScore <= currentFormatScore)
             {
-                _logger.Debug("Existing item has a better preferred word score, skipping");
+                _logger.Debug("New item's custom formats [{0}] do not improve on [{1}], skipping",
+                              newCustomFormats.ConcatToString(),
+                              currentCustomFormats.ConcatToString());
+
                 return false;
             }
 
-            _logger.Debug("New item has a better preferred word score");
+            _logger.Debug("New item has a better custom format score");
             return true;
         }
 
@@ -113,7 +114,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             return false;
         }
 
-        public bool CutoffNotMet(QualityProfile profile, List<QualityModel> currentQualities, int currentScore, QualityModel newQuality = null, int newScore = 0)
+        private bool CustomFormatCutoffNotMet(QualityProfile profile, List<CustomFormat> currentFormats)
+        {
+            var score = profile.CalculateCustomFormatScore(currentFormats);
+            return score < profile.CutoffFormatScore;
+        }
+
+        public bool CutoffNotMet(QualityProfile profile, List<QualityModel> currentQualities, List<CustomFormat> currentFormats, QualityModel newQuality = null)
         {
             foreach (var quality in currentQualities)
             {
@@ -123,7 +130,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 }
             }
 
-            if (IsPreferredWordUpgradable(currentScore, newScore))
+            if (CustomFormatCutoffNotMet(profile, currentFormats))
             {
                 return true;
             }
@@ -147,16 +154,23 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             return false;
         }
 
-        public bool IsUpgradeAllowed(QualityProfile qualityProfile, List<QualityModel> currentQualities, QualityModel newQuality)
+        public bool IsUpgradeAllowed(QualityProfile qualityProfile, List<QualityModel> currentQualities, List<CustomFormat> currentCustomFormats, QualityModel newQuality, List<CustomFormat> newCustomFormats)
         {
             var isQualityUpgrade = IsQualityUpgradable(qualityProfile, currentQualities, newQuality);
+            var isCustomFormatUpgrade = qualityProfile.CalculateCustomFormatScore(newCustomFormats) > qualityProfile.CalculateCustomFormatScore(currentCustomFormats);
 
-            return CheckUpgradeAllowed(qualityProfile, isQualityUpgrade);
+            return CheckUpgradeAllowed(qualityProfile, isQualityUpgrade, isCustomFormatUpgrade);
         }
 
-        private bool CheckUpgradeAllowed(QualityProfile qualityProfile, ProfileComparisonResult isQualityUpgrade)
+        private bool CheckUpgradeAllowed(QualityProfile qualityProfile, ProfileComparisonResult isQualityUpgrade, bool isCustomFormatUpgrade)
         {
-            if (isQualityUpgrade == ProfileComparisonResult.Upgrade && !qualityProfile.UpgradeAllowed)
+            if ((isQualityUpgrade == ProfileComparisonResult.Upgrade || isCustomFormatUpgrade) && qualityProfile.UpgradeAllowed)
+            {
+                _logger.Debug("Quality profile allows upgrading");
+                return true;
+            }
+
+            if ((isQualityUpgrade == ProfileComparisonResult.Upgrade || isCustomFormatUpgrade) && !qualityProfile.UpgradeAllowed)
             {
                 _logger.Debug("Quality profile does not allow upgrades, skipping");
                 return false;
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs
index 638ebcd30..e28ab68bd 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
@@ -15,6 +16,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         private readonly UpgradableSpecification _upgradableSpecification;
         private readonly IMediaFileService _mediaFileService;
         private readonly ITrackService _trackService;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly Logger _logger;
         private readonly ICached<bool> _missingFilesCache;
 
@@ -22,11 +24,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                                            Logger logger,
                                            ICacheManager cacheManager,
                                            IMediaFileService mediaFileService,
-                                           ITrackService trackService)
+                                           ITrackService trackService,
+                                           ICustomFormatCalculationService formatService)
         {
             _upgradableSpecification = upgradableSpecification;
             _mediaFileService = mediaFileService;
             _trackService = trackService;
+            _formatService = formatService;
             _missingFilesCache = cacheManager.GetCache<bool>(GetType());
             _logger = logger;
         }
@@ -51,11 +55,16 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                     // Get a distinct list of all current track qualities for a given album
                     var currentQualities = trackFiles.Select(c => c.Quality).Distinct().ToList();
 
+                    // TODO: Should union these?
+                    var fileCustomFormats = _formatService.ParseCustomFormat(trackFiles.First(), subject.Artist);
+
                     _logger.Debug("Comparing file quality with report. Existing files contain {0}", currentQualities.ConcatToString());
 
                     if (!_upgradableSpecification.IsUpgradeAllowed(qualityProfile,
-                                                               currentQualities,
-                                                               subject.ParsedAlbumInfo.Quality))
+                                                                   currentQualities,
+                                                                   fileCustomFormats,
+                                                                   subject.ParsedAlbumInfo.Quality,
+                                                                   subject.CustomFormats))
                     {
                         _logger.Debug("Upgrading is not allowed by the quality profile");
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
index 44c4737bb..13d0d4a3d 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
@@ -3,11 +3,11 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications
 {
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         private readonly IMediaFileService _mediaFileService;
         private readonly ITrackService _trackService;
         private readonly UpgradableSpecification _upgradableSpecification;
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly Logger _logger;
         private readonly ICached<bool> _missingFilesCache;
 
@@ -24,13 +24,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                                         IMediaFileService mediaFileService,
                                         ITrackService trackService,
                                         ICacheManager cacheManager,
-                                        IPreferredWordService preferredWordServiceCalculator,
+                                        ICustomFormatCalculationService formatService,
                                         Logger logger)
         {
             _upgradableSpecification = qualityUpgradableSpecification;
             _mediaFileService = mediaFileService;
             _trackService = trackService;
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
+            _formatService = formatService;
             _logger = logger;
             _missingFilesCache = cacheManager.GetCache<bool>(GetType());
         }
@@ -51,11 +51,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 {
                     var currentQualities = trackFiles.Select(c => c.Quality).Distinct().ToList();
 
+                    var customFormats = _formatService.ParseCustomFormat(trackFiles[0]);
+
                     if (!_upgradableSpecification.IsUpgradable(subject.Artist.QualityProfile,
                                                                currentQualities,
-                                                               _preferredWordServiceCalculator.Calculate(subject.Artist, trackFiles[0].GetSceneOrFileName(), subject.Release?.IndexerId ?? 0),
+                                                               customFormats,
                                                                subject.ParsedAlbumInfo.Quality,
-                                                               subject.PreferredWordScore))
+                                                               subject.CustomFormats))
                     {
                         return Decision.Reject("Existing files on disk is of equal or higher preference: {0}", currentQualities.ConcatToString());
                     }
diff --git a/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregatePreferredWordScore.cs b/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregatePreferredWordScore.cs
deleted file mode 100644
index 3e1c859d9..000000000
--- a/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregatePreferredWordScore.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
-
-namespace NzbDrone.Core.Download.Aggregation.Aggregators
-{
-    public class AggregatePreferredWordScore : IAggregateRemoteAlbum
-    {
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
-
-        public AggregatePreferredWordScore(IPreferredWordService preferredWordServiceCalculator)
-        {
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
-        }
-
-        public RemoteAlbum Aggregate(RemoteAlbum remoteAlbum)
-        {
-            remoteAlbum.PreferredWordScore = _preferredWordServiceCalculator.Calculate(remoteAlbum.Artist, remoteAlbum.Release.Title, remoteAlbum.Release.IndexerId);
-
-            return remoteAlbum;
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
index 4983c18f1..6a8de39e2 100644
--- a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
+++ b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
@@ -123,7 +123,7 @@ namespace NzbDrone.Core.Download.History
             history.Data.Add("Indexer", message.Album.Release.Indexer);
             history.Data.Add("DownloadClient", message.DownloadClient);
             history.Data.Add("DownloadClientName", message.DownloadClientName);
-            history.Data.Add("PreferredWordScore", message.Album.PreferredWordScore.ToString());
+            history.Data.Add("CustomFormatScore", message.Album.CustomFormatScore.ToString());
 
             _repository.Insert(history);
         }
diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
index e66a09d43..6334625b7 100644
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -5,7 +5,9 @@ using NLog;
 using NzbDrone.Common.Crypto;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Download.Aggregation;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Messaging.Events;
@@ -42,6 +44,8 @@ namespace NzbDrone.Core.Download.Pending
         private readonly IDelayProfileService _delayProfileService;
         private readonly ITaskManager _taskManager;
         private readonly IConfigService _configService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
+        private readonly IRemoteAlbumAggregationService _aggregationService;
         private readonly IEventAggregator _eventAggregator;
         private readonly Logger _logger;
 
@@ -52,6 +56,8 @@ namespace NzbDrone.Core.Download.Pending
                                     IDelayProfileService delayProfileService,
                                     ITaskManager taskManager,
                                     IConfigService configService,
+                                    ICustomFormatCalculationService formatCalculator,
+                                    IRemoteAlbumAggregationService aggregationService,
                                     IEventAggregator eventAggregator,
                                     Logger logger)
         {
@@ -62,6 +68,8 @@ namespace NzbDrone.Core.Download.Pending
             _delayProfileService = delayProfileService;
             _taskManager = taskManager;
             _configService = configService;
+            _formatCalculator = formatCalculator;
+            _aggregationService = aggregationService;
             _eventAggregator = eventAggregator;
             _logger = logger;
         }
@@ -311,6 +319,9 @@ namespace NzbDrone.Core.Download.Pending
                     Release = release.Release
                 };
 
+                _aggregationService.Augment(release.RemoteAlbum);
+                release.RemoteAlbum.CustomFormats = _formatCalculator.ParseCustomFormat(release.RemoteAlbum, release.Release.Size);
+
                 result.Add(release);
             }
 
diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
index 4725722a0..6de46407c 100644
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
@@ -5,6 +5,7 @@ using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Serializer;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Download.History;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Messaging.Events;
@@ -31,20 +32,23 @@ namespace NzbDrone.Core.Download.TrackedDownloads
         private readonly IEventAggregator _eventAggregator;
         private readonly IDownloadHistoryService _downloadHistoryService;
         private readonly ITrackedDownloadAlreadyImported _trackedDownloadAlreadyImported;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly Logger _logger;
         private readonly ICached<TrackedDownload> _cache;
 
         public TrackedDownloadService(IParsingService parsingService,
                                       ICacheManager cacheManager,
                                       IHistoryService historyService,
-                                      IDownloadHistoryService downloadHistoryService,
+                                      ICustomFormatCalculationService formatCalculator,
                                       IEventAggregator eventAggregator,
+                                      IDownloadHistoryService downloadHistoryService,
                                       ITrackedDownloadAlreadyImported trackedDownloadAlreadyImported,
                                       Logger logger)
         {
             _parsingService = parsingService;
             _historyService = historyService;
             _cache = cacheManager.GetCache<TrackedDownload>(GetType());
+            _formatCalculator = formatCalculator;
             _eventAggregator = eventAggregator;
             _trackedDownloadAlreadyImported = trackedDownloadAlreadyImported;
             _downloadHistoryService = downloadHistoryService;
@@ -178,6 +182,12 @@ namespace NzbDrone.Core.Download.TrackedDownloads
                     }
                 }
 
+                // Calculate custom formats
+                if (trackedDownload.RemoteAlbum != null)
+                {
+                    trackedDownload.RemoteAlbum.CustomFormats = _formatCalculator.ParseCustomFormat(trackedDownload.RemoteAlbum, downloadItem.TotalSize);
+                }
+
                 // Track it so it can be displayed in the queue even though we can't determine which artist it is for
                 if (trackedDownload.RemoteAlbum == null)
                 {
diff --git a/src/NzbDrone.Core/History/EntityHistoryService.cs b/src/NzbDrone.Core/History/EntityHistoryService.cs
index 4d2e8a4d0..a84f24dc9 100644
--- a/src/NzbDrone.Core/History/EntityHistoryService.cs
+++ b/src/NzbDrone.Core/History/EntityHistoryService.cs
@@ -164,6 +164,7 @@ namespace NzbDrone.Core.History
                 history.Data.Add("Guid", message.Album.Release.Guid);
                 history.Data.Add("Protocol", ((int)message.Album.Release.DownloadProtocol).ToString());
                 history.Data.Add("DownloadForced", (!message.Album.DownloadAllowed).ToString());
+                history.Data.Add("CustomFormatScore", message.Album.CustomFormatScore.ToString());
 
                 if (!message.Album.ParsedAlbumInfo.ReleaseHash.IsNullOrWhiteSpace())
                 {
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupQualityProfileFormatItems.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupQualityProfileFormatItems.cs
new file mode 100644
index 000000000..ace84ca29
--- /dev/null
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupQualityProfileFormatItems.cs
@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Profiles.Qualities;
+
+namespace NzbDrone.Core.Housekeeping.Housekeepers
+{
+    public class CleanupQualityProfileFormatItems : IHousekeepingTask
+    {
+        private readonly IQualityProfileFormatItemsCleanupRepository _repository;
+        private readonly ICustomFormatRepository _customFormatRepository;
+
+        public CleanupQualityProfileFormatItems(IQualityProfileFormatItemsCleanupRepository repository,
+                                                ICustomFormatRepository customFormatRepository)
+        {
+            _repository = repository;
+            _customFormatRepository = customFormatRepository;
+        }
+
+        public void Clean()
+        {
+            var test = _customFormatRepository.All();
+            var customFormats = _customFormatRepository.All().ToDictionary(c => c.Id);
+            var profiles = _repository.All();
+            var updatedProfiles = new List<QualityProfile>();
+
+            foreach (var profile in profiles)
+            {
+                var formatItems = new List<ProfileFormatItem>();
+
+                // Make sure the profile doesn't include formats that have been removed
+                profile.FormatItems.ForEach(p =>
+                {
+                    if (p.Format != null && customFormats.ContainsKey(p.Format.Id))
+                    {
+                        formatItems.Add(p);
+                    }
+                });
+
+                // Make sure the profile includes all available formats
+                foreach (var customFormat in customFormats)
+                {
+                    if (formatItems.None(f => f.Format.Id == customFormat.Key))
+                    {
+                        formatItems.Insert(0, new ProfileFormatItem
+                        {
+                            Format = customFormat.Value,
+                            Score = 0
+                        });
+                    }
+                }
+
+                var previousIds = profile.FormatItems.Select(i => i.Format.Id).ToList();
+                var ids = formatItems.Select(i => i.Format.Id).ToList();
+
+                // Update the profile if any formats were added or removed
+                if (ids.Except(previousIds).Any() || previousIds.Except(ids).Any())
+                {
+                    profile.FormatItems = formatItems;
+
+                    if (profile.FormatItems.Empty())
+                    {
+                        profile.MinFormatScore = 0;
+                        profile.CutoffFormatScore = 0;
+                    }
+
+                    updatedProfiles.Add(profile);
+                }
+            }
+
+            if (updatedProfiles.Any())
+            {
+                _repository.SetFields(updatedProfiles, p => p.FormatItems, p => p.MinFormatScore, p => p.CutoffFormatScore);
+            }
+        }
+    }
+
+    public interface IQualityProfileFormatItemsCleanupRepository : IBasicRepository<QualityProfile>
+    {
+    }
+
+    public class QualityProfileFormatItemsCleanupRepository : BasicRepository<QualityProfile>, IQualityProfileFormatItemsCleanupRepository
+    {
+        public QualityProfileFormatItemsCleanupRepository(IMainDatabase database, IEventAggregator eventAggregator)
+            : base(database, eventAggregator)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 8987c028c..46b90f732 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -106,6 +106,10 @@
   "BlocklistHelpText": "Prevents Lidarr from automatically grabbing these files again",
   "BlocklistRelease": "Blocklist Release",
   "Branch": "Branch",
+  "BypassIfAboveCustomFormatScore": "Bypass if Above Custom Format Score",
+  "BypassIfAboveCustomFormatScoreHelpText": "Enable bypass when release has a score higher than the configured minimum custom format score",
+  "BypassIfHighestQuality": "Bypass if Highest Quality",
+  "BypassIfHighestQualityHelpText": "Bypass delay when release has the highest enabled quality in the quality profile",
   "BypassProxyForLocalAddresses": "Bypass Proxy for Local Addresses",
   "Calendar": "Calendar",
   "CalendarWeekColumnHeaderHelpText": "Shown above each column when week is the active view",
@@ -152,6 +156,7 @@
   "CreateGroup": "Create group",
   "Custom": "Custom",
   "CustomFilters": "Custom Filters",
+  "CustomFormatScore": "Custom Format Score",
   "CutoffHelpText": "Once this quality is reached Lidarr will no longer download albums",
   "CutoffUnmet": "Cutoff Unmet",
   "Database": "Database",
@@ -430,7 +435,7 @@
   "Mechanism": "Mechanism",
   "MediaCount": "Media Count",
   "MediaInfo": "Media Info",
-  "MediaManagement": "MediaManagement",
+  "MediaManagement": "Media Management",
   "MediaManagementSettings": "Media Management Settings",
   "Medium": "Medium",
   "MediumFormat": "Medium Format",
@@ -447,6 +452,8 @@
   "MIA": "MIA",
   "MinimumAge": "Minimum Age",
   "MinimumAgeHelpText": "Usenet only: Minimum age in minutes of NZBs before they are grabbed. Use this to give new releases time to propagate to your usenet provider.",
+  "MinimumCustomFormatScore": "Minimum Custom Format Score",
+  "MinimumCustomFormatScoreHelpText": "Minimum Custom Format Score required to bypass delay for the preferred protocol",
   "MinimumFreeSpace": "Minimum Free Space",
   "MinimumFreeSpaceWhenImportingHelpText": "Prevent import if it would leave less than this amount of disk space available",
   "MinimumLimits": "Minimum Limits",
@@ -835,6 +842,7 @@
   "UnableToLoadImportListExclusions": "Unable to load Import List Exclusions",
   "UnableToLoadIndexerOptions": "Unable to load indexer options",
   "UnableToLoadIndexers": "Unable to load Indexers",
+  "UnableToLoadInteractiveSearch": "Unable to load interactive search results",
   "UnableToLoadInteractiveSerach": "Unable to load results for this album search. Try again later",
   "UnableToLoadLists": "Unable to load Lists",
   "UnableToLoadMediaManagementSettings": "Unable to load Media Management settings",
diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
index d26cf0525..c9576ee31 100644
--- a/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
@@ -175,25 +175,6 @@ namespace NzbDrone.Core.MediaFiles
 
             var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name);
             var folderInfo = Parser.Parser.ParseAlbumTitle(directoryInfo.Name);
-            var trackInfo = new ParsedTrackInfo { };
-
-            if (folderInfo != null)
-            {
-                _logger.Debug("{0} folder quality: {1}", cleanedUpName, folderInfo.Quality);
-
-                trackInfo = new ParsedTrackInfo
-                {
-                    AlbumTitle = folderInfo.AlbumTitle,
-                    ArtistTitle = folderInfo.ArtistName,
-                    Quality = folderInfo.Quality,
-                    ReleaseGroup = folderInfo.ReleaseGroup,
-                    ReleaseHash = folderInfo.ReleaseHash,
-                };
-            }
-            else
-            {
-                trackInfo = null;
-            }
 
             var audioFiles = _diskScanService.FilterFiles(directoryInfo.FullName, _diskScanService.GetAudioFiles(directoryInfo.FullName));
 
@@ -218,7 +199,7 @@ namespace NzbDrone.Core.MediaFiles
             var idInfo = new ImportDecisionMakerInfo
             {
                 DownloadClientItem = downloadClientItem,
-                ParsedTrackInfo = trackInfo
+                ParsedAlbumInfo = folderInfo
             };
             var idConfig = new ImportDecisionMakerConfig
             {
diff --git a/src/NzbDrone.Core/MediaFiles/TrackFile.cs b/src/NzbDrone.Core/MediaFiles/TrackFile.cs
index 182dd5a3e..de5d8a805 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackFile.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackFile.cs
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.MediaFiles
         public long Size { get; set; }
         public DateTime Modified { get; set; }
         public DateTime DateAdded { get; set; }
+        public string OriginalFilePath { get; set; }
         public string SceneName { get; set; }
         public string ReleaseGroup { get; set; }
         public QualityModel Quality { get; set; }
@@ -40,7 +41,7 @@ namespace NzbDrone.Core.MediaFiles
 
             if (Path.IsNotNullOrWhiteSpace())
             {
-                return System.IO.Path.GetFileName(Path);
+                return System.IO.Path.GetFileNameWithoutExtension(Path);
             }
 
             return string.Empty;
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/AggregationService.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/AggregationService.cs
index b9674bf9a..661db2c28 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/AggregationService.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/AggregationService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
 using NzbDrone.Core.MediaFiles.TrackImport.Aggregation.Aggregators;
 using NzbDrone.Core.Parser.Model;
 
@@ -35,7 +36,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Aggregation
         public LocalTrack Augment(LocalTrack localTrack, bool otherFiles)
         {
             if (localTrack.DownloadClientAlbumInfo == null &&
-                localTrack.FolderTrackInfo == null &&
+                localTrack.FolderAlbumInfo == null &&
                 localTrack.FileTrackInfo == null)
             {
                 if (MediaFileExtensions.Extensions.Contains(Path.GetExtension(localTrack.Path)))
@@ -45,6 +46,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Aggregation
             }
 
             localTrack.Size = _diskProvider.GetFileSize(localTrack.Path);
+            localTrack.SceneName = localTrack.SceneSource ? SceneNameCalculator.GetSceneName(localTrack) : null;
 
             foreach (var augmenter in _trackAugmenters)
             {
@@ -54,6 +56,8 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Aggregation
                 }
                 catch (Exception ex)
                 {
+                    var message = $"Unable to augment information for file: '{localTrack.Path}'. Artist: {localTrack.Artist} Error: {ex.Message}";
+
                     _logger.Warn(ex, ex.Message);
                 }
             }
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateQuality.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateQuality.cs
index b926a77c8..b2ecf8487 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateQuality.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateQuality.cs
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Aggregation.Aggregators
 
             if (quality == null)
             {
-                quality = localTrack.FolderTrackInfo?.Quality;
+                quality = localTrack.FolderAlbumInfo?.Quality;
             }
 
             if (quality == null)
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateReleaseGroup.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateReleaseGroup.cs
index 2bc2a80c9..d62fad478 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateReleaseGroup.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Aggregation/Aggregators/AggregateReleaseGroup.cs
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Aggregation.Aggregators
 
             if (releaseGroup.IsNullOrWhiteSpace())
             {
-                releaseGroup = localTrack.FolderTrackInfo?.ReleaseGroup;
+                releaseGroup = localTrack.FolderAlbumInfo?.ReleaseGroup;
             }
 
             if (releaseGroup.IsNullOrWhiteSpace())
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
index 26e717acd..db9627ef3 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -212,7 +213,8 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
 
                     if (!localTrack.ExistingFile)
                     {
-                        trackFile.SceneName = GetSceneReleaseName(downloadClientItem);
+                        trackFile.SceneName = localTrack.SceneName;
+                        trackFile.OriginalFilePath = GetOriginalFilePath(downloadClientItem, localTrack);
 
                         var moveResult = _trackFileUpgrader.UpgradeTrackFile(trackFile, localTrack, copyOnly);
                         oldFiles = moveResult.OldFiles;
@@ -453,21 +455,41 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
             }
         }
 
-        private string GetSceneReleaseName(DownloadClientItem downloadClientItem)
+        private string GetOriginalFilePath(DownloadClientItem downloadClientItem, LocalTrack localTrack)
         {
-            if (downloadClientItem != null)
+            var path = localTrack.Path;
+
+            if (downloadClientItem != null && !downloadClientItem.OutputPath.IsEmpty)
             {
-                var title = Parser.Parser.RemoveFileExtension(downloadClientItem.Title);
+                var outputDirectory = downloadClientItem.OutputPath.Directory.ToString();
+
+                if (outputDirectory.IsParentPath(path))
+                {
+                    return outputDirectory.GetRelativePath(path);
+                }
+            }
 
-                var parsedTitle = Parser.Parser.ParseAlbumTitle(title);
+            var folderEpisodeInfo = localTrack.FolderAlbumInfo;
 
-                if (parsedTitle != null)
+            if (folderEpisodeInfo != null)
+            {
+                var folderPath = path.GetAncestorPath(folderEpisodeInfo.ReleaseTitle);
+
+                if (folderPath != null)
                 {
-                    return title;
+                    return folderPath.GetParentPath().GetRelativePath(path);
                 }
             }
 
-            return null;
+            var parentPath = path.GetParentPath();
+            var grandparentPath = parentPath.GetParentPath();
+
+            if (grandparentPath != null)
+            {
+                return grandparentPath.GetRelativePath(path);
+            }
+
+            return Path.GetFileName(path);
         }
     }
 }
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportDecisionMaker.cs
index 77a955188..4ad968ea8 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportDecisionMaker.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportDecisionMaker.cs
@@ -31,7 +31,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
     public class ImportDecisionMakerInfo
     {
         public DownloadClientItem DownloadClientItem { get; set; }
-        public ParsedTrackInfo ParsedTrackInfo { get; set; }
+        public ParsedAlbumInfo ParsedAlbumInfo { get; set; }
     }
 
     public class ImportDecisionMakerConfig
@@ -76,7 +76,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
             _logger = logger;
         }
 
-        public Tuple<List<LocalTrack>, List<ImportDecision<LocalTrack>>> GetLocalTracks(List<IFileInfo> musicFiles, DownloadClientItem downloadClientItem, ParsedTrackInfo folderInfo, FilterFilesType filter)
+        public Tuple<List<LocalTrack>, List<ImportDecision<LocalTrack>>> GetLocalTracks(List<IFileInfo> musicFiles, DownloadClientItem downloadClientItem, ParsedAlbumInfo folderInfo, FilterFilesType filter)
         {
             var watch = new System.Diagnostics.Stopwatch();
             watch.Start();
@@ -108,7 +108,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
                 var localTrack = new LocalTrack
                 {
                     DownloadClientAlbumInfo = downloadClientItemInfo,
-                    FolderTrackInfo = folderInfo,
+                    FolderAlbumInfo = folderInfo,
                     Path = file.FullName,
                     Size = file.Length,
                     Modified = file.LastWriteTimeUtc,
@@ -144,7 +144,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
             idOverrides ??= new IdentificationOverrides();
             itemInfo ??= new ImportDecisionMakerInfo();
 
-            var trackData = GetLocalTracks(musicFiles, itemInfo.DownloadClientItem, itemInfo.ParsedTrackInfo, config.Filter);
+            var trackData = GetLocalTracks(musicFiles, itemInfo.DownloadClientItem, itemInfo.ParsedAlbumInfo, config.Filter);
             var localTracks = trackData.Item1;
             var decisions = trackData.Item2;
 
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportItem.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportItem.cs
index 27cd5ef04..b96fbc045 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportItem.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportItem.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Music;
@@ -12,6 +13,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
         public ManualImportItem()
         {
             Tracks = new List<Track>();
+            CustomFormats = new List<CustomFormat>();
         }
 
         public string Path { get; set; }
@@ -24,6 +26,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
         public QualityModel Quality { get; set; }
         public string ReleaseGroup { get; set; }
         public string DownloadId { get; set; }
+        public List<CustomFormat> CustomFormats { get; set; }
         public IEnumerable<Rejection> Rejections { get; set; }
         public ParsedTrackInfo Tags { get; set; }
         public bool AdditionalFile { get; set; }
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportService.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportService.cs
index 2d0eee36d..0b8a18f6c 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Manual/ManualImportService.cs
@@ -9,6 +9,7 @@ using NzbDrone.Common.Crypto;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.TrackedDownloads;
@@ -35,6 +36,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
         private readonly IRootFolderService _rootFolderService;
         private readonly IDiskScanService _diskScanService;
         private readonly IMakeImportDecision _importDecisionMaker;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly IArtistService _artistService;
         private readonly IAlbumService _albumService;
         private readonly IReleaseService _releaseService;
@@ -52,6 +54,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
                                    IRootFolderService rootFolderService,
                                    IDiskScanService diskScanService,
                                    IMakeImportDecision importDecisionMaker,
+                                   ICustomFormatCalculationService formatCalculator,
                                    IArtistService artistService,
                                    IAlbumService albumService,
                                    IReleaseService releaseService,
@@ -69,6 +72,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
             _rootFolderService = rootFolderService;
             _diskScanService = diskScanService;
             _importDecisionMaker = importDecisionMaker;
+            _formatCalculator = formatCalculator;
             _artistService = artistService;
             _albumService = albumService;
             _releaseService = releaseService;
@@ -153,7 +157,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
             var itemInfo = new ImportDecisionMakerInfo
             {
                 DownloadClientItem = downloadClientItem,
-                ParsedTrackInfo = Parser.Parser.ParseMusicTitle(directoryInfo.Name)
+                ParsedAlbumInfo = Parser.Parser.ParseAlbumTitle(directoryInfo.Name)
             };
             var config = new ImportDecisionMakerConfig
             {
@@ -273,6 +277,8 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Manual
             if (decision.Item.Artist != null)
             {
                 item.Artist = decision.Item.Artist;
+
+                item.CustomFormats = _formatCalculator.ParseCustomFormat(decision.Item);
             }
 
             if (decision.Item.Album != null)
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/SceneNameCalculator.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/SceneNameCalculator.cs
new file mode 100644
index 000000000..6983b4bdf
--- /dev/null
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/SceneNameCalculator.cs
@@ -0,0 +1,38 @@
+using System.IO;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.MediaFiles.EpisodeImport
+{
+    public static class SceneNameCalculator
+    {
+        public static string GetSceneName(LocalTrack localEpisode)
+        {
+            var downloadClientInfo = localEpisode.DownloadClientAlbumInfo;
+
+            if (downloadClientInfo != null && !downloadClientInfo.Discography)
+            {
+                return Parser.Parser.RemoveFileExtension(downloadClientInfo.ReleaseTitle);
+            }
+
+            var fileName = Path.GetFileNameWithoutExtension(localEpisode.Path.CleanFilePath());
+
+            if (SceneChecker.IsSceneTitle(fileName))
+            {
+                return fileName;
+            }
+
+            var folderTitle = localEpisode.FolderAlbumInfo?.ReleaseTitle;
+
+            if (localEpisode.FolderAlbumInfo?.Discography == false &&
+                folderTitle.IsNotNullOrWhiteSpace() &&
+                SceneChecker.IsSceneTitle(folderTitle))
+            {
+                return folderTitle;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/SameFileSpecification.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/SameFileSpecification.cs
deleted file mode 100644
index b01f06e50..000000000
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/SameFileSpecification.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Linq;
-using NLog;
-using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.MediaFiles.TrackImport.Specifications
-{
-    public class SameFileSpecification : IImportDecisionEngineSpecification<LocalTrack>
-    {
-        private readonly Logger _logger;
-
-        public SameFileSpecification(Logger logger)
-        {
-            _logger = logger;
-        }
-
-        public Decision IsSatisfiedBy(LocalTrack localTrack, DownloadClientItem downloadClientItem)
-        {
-            var trackFiles = localTrack.Tracks.Where(e => e.TrackFileId != 0).Select(e => e.TrackFile).ToList();
-
-            if (trackFiles.Count == 0)
-            {
-                _logger.Debug("No existing track file, skipping");
-                return Decision.Accept();
-            }
-
-            if (trackFiles.Count > 1)
-            {
-                _logger.Debug("More than one existing track file, skipping.");
-                return Decision.Accept();
-            }
-
-            var trackFile = trackFiles.First().Value;
-
-            if (trackFile == null)
-            {
-                var track = localTrack.Tracks.First();
-                _logger.Trace("Unable to get track file details from the DB. TrackId: {0} TrackFileId: {1}", track.Id, track.TrackFileId);
-
-                return Decision.Accept();
-            }
-
-            if (trackFiles.First().Value.Size == localTrack.Size)
-            {
-                _logger.Debug("'{0}' Has the same filesize as existing file", localTrack.Path);
-                return Decision.Reject("Has the same filesize as existing file");
-            }
-
-            return Decision.Accept();
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
index d75d08ee8..7632f15d8 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Parser.Model;
@@ -11,11 +12,15 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Specifications
     public class UpgradeSpecification : IImportDecisionEngineSpecification<LocalTrack>
     {
         private readonly IConfigService _configService;
+        private readonly ICustomFormatCalculationService _customFormatCalculationService;
         private readonly Logger _logger;
 
-        public UpgradeSpecification(IConfigService configService, Logger logger)
+        public UpgradeSpecification(IConfigService configService,
+                                    ICustomFormatCalculationService customFormatCalculationService,
+                                    Logger logger)
         {
             _configService = configService;
+            _customFormatCalculationService = customFormatCalculationService;
             _logger = logger;
         }
 
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookRelease.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookRelease.cs
index a3fa1823e..4c6c48de5 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookRelease.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookRelease.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 
@@ -17,6 +19,8 @@ namespace NzbDrone.Core.Notifications.Webhook
             ReleaseTitle = remoteAlbum.Release.Title;
             Indexer = remoteAlbum.Release.Indexer;
             Size = remoteAlbum.Release.Size;
+            CustomFormats = remoteAlbum.CustomFormats?.Select(x => x.Name).ToList();
+            CustomFormatScore = remoteAlbum.CustomFormatScore;
         }
 
         public string Quality { get; set; }
@@ -25,5 +29,7 @@ namespace NzbDrone.Core.Notifications.Webhook
         public string ReleaseTitle { get; set; }
         public string Indexer { get; set; }
         public long Size { get; set; }
+        public int CustomFormatScore { get; set; }
+        public List<string> CustomFormats { get; set; }
     }
 }
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 6a112e1d9..ae3bb5b9d 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -8,6 +8,7 @@ using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Profiles.Releases;
@@ -17,7 +18,7 @@ namespace NzbDrone.Core.Organizer
 {
     public interface IBuildFileNames
     {
-        string BuildTrackFileName(List<Track> tracks, Artist artist, Album album, TrackFile trackFile, NamingConfig namingConfig = null, List<string> preferredWords = null);
+        string BuildTrackFileName(List<Track> tracks, Artist artist, Album album, TrackFile trackFile, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null);
         string BuildTrackFilePath(Artist artist, string fileName, string extension);
         BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec);
         string GetArtistFolder(Artist artist, NamingConfig namingConfig = null);
@@ -27,7 +28,7 @@ namespace NzbDrone.Core.Organizer
     {
         private readonly INamingConfigService _namingConfigService;
         private readonly IQualityDefinitionService _qualityDefinitionService;
-        private readonly IPreferredWordService _preferredWordService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly ICached<TrackFormat[]> _trackFormatCache;
         private readonly ICached<AbsoluteTrackFormat[]> _absoluteTrackFormatCache;
         private readonly Logger _logger;
@@ -71,18 +72,18 @@ namespace NzbDrone.Core.Organizer
         public FileNameBuilder(INamingConfigService namingConfigService,
                                IQualityDefinitionService qualityDefinitionService,
                                ICacheManager cacheManager,
-                               IPreferredWordService preferredWordService,
+                               ICustomFormatCalculationService formatCalculator,
                                Logger logger)
         {
             _namingConfigService = namingConfigService;
             _qualityDefinitionService = qualityDefinitionService;
-            _preferredWordService = preferredWordService;
+            _formatCalculator = formatCalculator;
             _trackFormatCache = cacheManager.GetCache<TrackFormat[]>(GetType(), "trackFormat");
             _absoluteTrackFormatCache = cacheManager.GetCache<AbsoluteTrackFormat[]>(GetType(), "absoluteTrackFormat");
             _logger = logger;
         }
 
-        public string BuildTrackFileName(List<Track> tracks, Artist artist, Album album, TrackFile trackFile, NamingConfig namingConfig = null, List<string> preferredWords = null)
+        public string BuildTrackFileName(List<Track> tracks, Artist artist, Album album, TrackFile trackFile, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null)
         {
             if (namingConfig == null)
             {
@@ -117,7 +118,7 @@ namespace NzbDrone.Core.Organizer
             AddTrackFileTokens(tokenHandlers, trackFile);
             AddQualityTokens(tokenHandlers, artist, trackFile);
             AddMediaInfoTokens(tokenHandlers, trackFile);
-            AddPreferredWords(tokenHandlers, artist, trackFile, preferredWords);
+            AddCustomFormats(tokenHandlers, artist, trackFile, customFormats);
 
             var splitPatterns = pattern.Split(new char[] { '\\', '/' }, StringSplitOptions.RemoveEmptyEntries);
             var components = new List<string>();
@@ -363,14 +364,15 @@ namespace NzbDrone.Core.Organizer
             tokenHandlers["{MediaInfo AudioSampleRate}"] = m => MediaInfoFormatter.FormatAudioSampleRate(trackFile.MediaInfo);
         }
 
-        private void AddPreferredWords(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Artist artist, TrackFile trackFile, List<string> preferredWords = null)
+        private void AddCustomFormats(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Artist series, TrackFile episodeFile, List<CustomFormat> customFormats = null)
         {
-            if (preferredWords == null)
+            if (customFormats == null)
             {
-                preferredWords = _preferredWordService.GetMatchingPreferredWords(artist, trackFile.GetSceneOrFileName());
+                episodeFile.Artist = series;
+                customFormats = _formatCalculator.ParseCustomFormat(episodeFile, series);
             }
 
-            tokenHandlers["{Preferred Words}"] = m => string.Join(" ", preferredWords);
+            tokenHandlers["{Custom Formats}"] = m => string.Join(" ", customFormats.Where(x => x.IncludeCustomFormatWhenRenaming));
         }
 
         private string ReplaceTokens(string pattern, Dictionary<string, Func<TokenMatch, string>> tokenHandlers, NamingConfig namingConfig)
diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
index 538ed7369..c8f8fc5ed 100644
--- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser.Model;
@@ -24,7 +25,7 @@ namespace NzbDrone.Core.Organizer
         private static Track _track1;
         private static List<Track> _singleTrack;
         private static TrackFile _singleTrackFile;
-        private static List<string> _preferredWords;
+        private static List<CustomFormat> _customFormats;
 
         public FileNameSampleService(IBuildFileNames buildFileNames)
         {
@@ -99,6 +100,20 @@ namespace NzbDrone.Core.Organizer
 
             _singleTrack = new List<Track> { _track1 };
 
+            _customFormats = new List<CustomFormat>
+            {
+                new CustomFormat
+                {
+                    Name = "Surround Sound",
+                    IncludeCustomFormatWhenRenaming = true
+                },
+                new CustomFormat
+                {
+                    Name = "x264",
+                    IncludeCustomFormatWhenRenaming = true
+                }
+            };
+
             var mediaInfo = new MediaInfoModel()
             {
                 AudioFormat = "Flac Audio",
@@ -116,11 +131,6 @@ namespace NzbDrone.Core.Organizer
                 ReleaseGroup = "RlsGrp",
                 MediaInfo = mediaInfo
             };
-
-            _preferredWords = new List<string>
-            {
-                "iNTERNAL"
-            };
         }
 
         public SampleResult GetStandardTrackSample(NamingConfig nameSpec)
@@ -164,7 +174,7 @@ namespace NzbDrone.Core.Organizer
         {
             try
             {
-                return _buildFileNames.BuildTrackFileName(tracks, artist, album, trackFile, nameSpec, _preferredWords);
+                return _buildFileNames.BuildTrackFileName(tracks, artist, album, trackFile, nameSpec, _customFormats);
             }
             catch (NamingFormatException)
             {
diff --git a/src/NzbDrone.Core/Parser/Model/LocalTrack.cs b/src/NzbDrone.Core/Parser/Model/LocalTrack.cs
index 0c89f196c..1fc38c6ef 100644
--- a/src/NzbDrone.Core/Parser/Model/LocalTrack.cs
+++ b/src/NzbDrone.Core/Parser/Model/LocalTrack.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Parser.Model
         public long Size { get; set; }
         public DateTime Modified { get; set; }
         public ParsedTrackInfo FileTrackInfo { get; set; }
-        public ParsedTrackInfo FolderTrackInfo { get; set; }
+        public ParsedAlbumInfo FolderAlbumInfo { get; set; }
         public ParsedAlbumInfo DownloadClientAlbumInfo { get; set; }
         public List<string> AcoustIdResults { get; set; }
         public Artist Artist { get; set; }
@@ -30,6 +30,7 @@ namespace NzbDrone.Core.Parser.Model
         public bool AdditionalFile { get; set; }
         public bool SceneSource { get; set; }
         public string ReleaseGroup { get; set; }
+        public string SceneName { get; set; }
 
         public override string ToString()
         {
diff --git a/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs b/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs
index 8a783baf2..94c2746e0 100644
--- a/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.Parser.Model
@@ -15,6 +17,10 @@ namespace NzbDrone.Core.Parser.Model
         public string ReleaseGroup { get; set; }
         public string ReleaseHash { get; set; }
         public string ReleaseVersion { get; set; }
+        public string ReleaseTitle { get; set; }
+
+        [JsonIgnore]
+        public Dictionary<string, object> ExtraInfo { get; set; } = new Dictionary<string, object>();
 
         public override string ToString()
         {
diff --git a/src/NzbDrone.Core/Parser/Model/RemoteAlbum.cs b/src/NzbDrone.Core/Parser/Model/RemoteAlbum.cs
index ea4b35190..d05bf094b 100644
--- a/src/NzbDrone.Core/Parser/Model/RemoteAlbum.cs
+++ b/src/NzbDrone.Core/Parser/Model/RemoteAlbum.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Music;
 
@@ -14,11 +15,13 @@ namespace NzbDrone.Core.Parser.Model
         public List<Album> Albums { get; set; }
         public bool DownloadAllowed { get; set; }
         public TorrentSeedConfiguration SeedConfiguration { get; set; }
-        public int PreferredWordScore { get; set; }
+        public List<CustomFormat> CustomFormats { get; set; }
+        public int CustomFormatScore { get; set; }
 
         public RemoteAlbum()
         {
             Albums = new List<Album>();
+            CustomFormats = new List<CustomFormat>();
         }
 
         public bool IsRecentAlbum()
diff --git a/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs b/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs
index ef20bb6a5..928d5fdbc 100644
--- a/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs
+++ b/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Indexers;
 
@@ -12,6 +12,9 @@ namespace NzbDrone.Core.Profiles.Delay
         public int UsenetDelay { get; set; }
         public int TorrentDelay { get; set; }
         public int Order { get; set; }
+        public bool BypassIfHighestQuality { get; set; }
+        public bool BypassIfAboveCustomFormatScore { get; set; }
+        public int MinimumCustomFormatScore { get; set; }
         public HashSet<int> Tags { get; set; }
 
         public DelayProfile()
diff --git a/src/NzbDrone.Core/Profiles/ProfileFormatItem.cs b/src/NzbDrone.Core/Profiles/ProfileFormatItem.cs
new file mode 100644
index 000000000..7f498d172
--- /dev/null
+++ b/src/NzbDrone.Core/Profiles/ProfileFormatItem.cs
@@ -0,0 +1,11 @@
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Profiles
+{
+    public class ProfileFormatItem : IEmbeddedDocument
+    {
+        public CustomFormat Format { get; set; }
+        public int Score { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/Profiles/Qualities/QualityProfile.cs b/src/NzbDrone.Core/Profiles/Qualities/QualityProfile.cs
index 083a5ca9c..c345e0271 100644
--- a/src/NzbDrone.Core/Profiles/Qualities/QualityProfile.cs
+++ b/src/NzbDrone.Core/Profiles/Qualities/QualityProfile.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Qualities;
 
@@ -7,9 +8,17 @@ namespace NzbDrone.Core.Profiles.Qualities
 {
     public class QualityProfile : ModelBase
     {
+        public QualityProfile()
+        {
+            FormatItems = new List<ProfileFormatItem>();
+        }
+
         public string Name { get; set; }
         public bool UpgradeAllowed { get; set; }
         public int Cutoff { get; set; }
+        public int MinFormatScore { get; set; }
+        public int CutoffFormatScore { get; set; }
+        public List<ProfileFormatItem> FormatItems { get; set; }
         public List<QualityProfileQualityItem> Items { get; set; }
 
         public Quality LastAllowedQuality()
@@ -63,5 +72,10 @@ namespace NzbDrone.Core.Profiles.Qualities
 
             return new QualityIndex();
         }
+
+        public int CalculateCustomFormatScore(List<CustomFormat> formats)
+        {
+            return FormatItems.Where(x => formats.Contains(x.Format)).Sum(x => x.Score);
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs
index 9a49aa891..65b82eb75 100644
--- a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs
+++ b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 
@@ -10,9 +13,44 @@ namespace NzbDrone.Core.Profiles.Qualities
 
     public class QualityProfileRepository : BasicRepository<QualityProfile>, IProfileRepository
     {
-        public QualityProfileRepository(IMainDatabase database, IEventAggregator eventAggregator)
+        private readonly ICustomFormatService _customFormatService;
+
+        public QualityProfileRepository(IMainDatabase database,
+                                        IEventAggregator eventAggregator,
+                                        ICustomFormatService customFormatService)
             : base(database, eventAggregator)
         {
+            _customFormatService = customFormatService;
+        }
+
+        protected override List<QualityProfile> Query(SqlBuilder builder)
+        {
+            var cfs = _customFormatService.All().ToDictionary(c => c.Id);
+
+            var profiles = base.Query(builder);
+
+            // Do the conversions from Id to full CustomFormat object here instead of in
+            // CustomFormatIntConverter to remove need to for a static property containing
+            // all the custom formats
+            foreach (var profile in profiles)
+            {
+                var formatItems = new List<ProfileFormatItem>();
+
+                foreach (var formatItem in profile.FormatItems)
+                {
+                    // Skip any format that has been removed, but the profile wasn't updated properly
+                    if (cfs.ContainsKey(formatItem.Format.Id))
+                    {
+                        formatItem.Format = cfs[formatItem.Format.Id];
+
+                        formatItems.Add(formatItem);
+                    }
+                }
+
+                profile.FormatItems = formatItems;
+            }
+
+            return profiles;
         }
 
         public bool Exists(int id)
diff --git a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs
index 1520ed700..53917818d 100644
--- a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs
+++ b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs
@@ -1,6 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.CustomFormats.Events;
 using NzbDrone.Core.ImportLists;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
@@ -21,17 +24,22 @@ namespace NzbDrone.Core.Profiles.Qualities
         QualityProfile GetDefaultProfile(string name, Quality cutoff = null, params Quality[] allowed);
     }
 
-    public class QualityProfileService : IQualityProfileService, IHandle<ApplicationStartedEvent>
+    public class QualityProfileService : IQualityProfileService,
+                                         IHandle<ApplicationStartedEvent>,
+                                         IHandle<CustomFormatAddedEvent>,
+                                         IHandle<CustomFormatDeletedEvent>
     {
         private readonly IProfileRepository _profileRepository;
         private readonly IArtistService _artistService;
         private readonly IImportListFactory _importListFactory;
+        private readonly ICustomFormatService _formatService;
         private readonly IRootFolderService _rootFolderService;
         private readonly Logger _logger;
 
         public QualityProfileService(IProfileRepository profileRepository,
                                      IArtistService artistService,
                                      IImportListFactory importListFactory,
+                                     ICustomFormatService formatService,
                                      IRootFolderService rootFolderService,
                                      Logger logger)
         {
@@ -39,6 +47,7 @@ namespace NzbDrone.Core.Profiles.Qualities
             _artistService = artistService;
             _importListFactory = importListFactory;
             _rootFolderService = rootFolderService;
+            _formatService = formatService;
             _logger = logger;
         }
 
@@ -139,6 +148,39 @@ namespace NzbDrone.Core.Profiles.Qualities
                 Quality.MP3_320);
         }
 
+        public void Handle(CustomFormatAddedEvent message)
+        {
+            var all = All();
+
+            foreach (var profile in all)
+            {
+                profile.FormatItems.Insert(0, new ProfileFormatItem
+                {
+                    Score = 0,
+                    Format = message.CustomFormat
+                });
+
+                Update(profile);
+            }
+        }
+
+        public void Handle(CustomFormatDeletedEvent message)
+        {
+            var all = All();
+            foreach (var profile in all)
+            {
+                profile.FormatItems = profile.FormatItems.Where(c => c.Format.Id != message.CustomFormat.Id).ToList();
+
+                if (profile.FormatItems.Empty())
+                {
+                    profile.MinFormatScore = 0;
+                    profile.CutoffFormatScore = 0;
+                }
+
+                Update(profile);
+            }
+        }
+
         public QualityProfile GetDefaultProfile(string name, Quality cutoff = null, params Quality[] allowed)
         {
             var groupedQualites = Quality.DefaultQualityDefinitions.GroupBy(q => q.GroupWeight);
@@ -177,11 +219,20 @@ namespace NzbDrone.Core.Profiles.Qualities
                 groupId++;
             }
 
+            var formatItems = _formatService.All().Select(format => new ProfileFormatItem
+            {
+                Score = 0,
+                Format = format
+            }).ToList();
+
             var qualityProfile = new QualityProfile
             {
                 Name = name,
                 Cutoff = profileCutoff,
-                Items = items
+                Items = items,
+                MinFormatScore = 0,
+                CutoffFormatScore = 0,
+                FormatItems = formatItems
             };
 
             return qualityProfile;
diff --git a/src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs b/src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs
deleted file mode 100644
index 24207d13b..000000000
--- a/src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Music;
-
-namespace NzbDrone.Core.Profiles.Releases
-{
-    public interface IPreferredWordService
-    {
-        int Calculate(Artist artist, string title, int indexerId);
-        List<string> GetMatchingPreferredWords(Artist artist, string title);
-    }
-
-    public class PreferredWordService : IPreferredWordService
-    {
-        private readonly IReleaseProfileService _releaseProfileService;
-        private readonly ITermMatcherService _termMatcherService;
-        private readonly Logger _logger;
-
-        public PreferredWordService(IReleaseProfileService releaseProfileService, ITermMatcherService termMatcherService, Logger logger)
-        {
-            _releaseProfileService = releaseProfileService;
-            _termMatcherService = termMatcherService;
-            _logger = logger;
-        }
-
-        public int Calculate(Artist artist, string title, int indexerId)
-        {
-            _logger.Trace("Calculating preferred word score for '{0}'", title);
-
-            var releaseProfiles = _releaseProfileService.EnabledForTags(artist.Tags, indexerId);
-            var matchingPairs = new List<KeyValuePair<string, int>>();
-
-            foreach (var releaseProfile in releaseProfiles)
-            {
-                foreach (var preferredPair in releaseProfile.Preferred)
-                {
-                    var term = preferredPair.Key;
-
-                    if (_termMatcherService.IsMatch(term, title))
-                    {
-                        matchingPairs.Add(preferredPair);
-                    }
-                }
-            }
-
-            var score = matchingPairs.Sum(p => p.Value);
-
-            _logger.Trace("Calculated preferred word score for '{0}': {1}", title, score);
-
-            return score;
-        }
-
-        public List<string> GetMatchingPreferredWords(Artist artist, string title)
-        {
-            var releaseProfiles = _releaseProfileService.EnabledForTags(artist.Tags, 0);
-            var matchingPairs = new List<KeyValuePair<string, int>>();
-
-            _logger.Trace("Calculating preferred word score for '{0}'", title);
-
-            foreach (var releaseProfile in releaseProfiles)
-            {
-                if (!releaseProfile.IncludePreferredWhenRenaming)
-                {
-                    continue;
-                }
-
-                foreach (var preferredPair in releaseProfile.Preferred)
-                {
-                    var term = preferredPair.Key;
-                    var matchingTerm = _termMatcherService.MatchingTerm(term, title);
-
-                    if (matchingTerm.IsNotNullOrWhiteSpace())
-                    {
-                        matchingPairs.Add(new KeyValuePair<string, int>(matchingTerm, preferredPair.Value));
-                    }
-                }
-            }
-
-            return matchingPairs.OrderByDescending(p => p.Value)
-                    .Select(p => p.Key)
-                    .ToList();
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs b/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs
index c8d6433c0..911498ce9 100644
--- a/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs
+++ b/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs
@@ -6,18 +6,16 @@ namespace NzbDrone.Core.Profiles.Releases
     public class ReleaseProfile : ModelBase
     {
         public bool Enabled { get; set; }
-        public string Required { get; set; }
-        public string Ignored { get; set; }
-        public List<KeyValuePair<string, int>> Preferred { get; set; }
-        public bool IncludePreferredWhenRenaming { get; set; }
+        public List<string> Required { get; set; }
+        public List<string> Ignored { get; set; }
         public int IndexerId { get; set; }
         public HashSet<int> Tags { get; set; }
 
         public ReleaseProfile()
         {
             Enabled = true;
-            Preferred = new List<KeyValuePair<string, int>>();
-            IncludePreferredWhenRenaming = true;
+            Required = new List<string>();
+            Ignored = new List<string>();
             Tags = new HashSet<int>();
             IndexerId = 0;
         }
diff --git a/src/NzbDrone.Core/Profiles/Releases/ReleaseProfileService.cs b/src/NzbDrone.Core/Profiles/Releases/ReleaseProfileService.cs
index 84c3e04c7..63db68b92 100644
--- a/src/NzbDrone.Core/Profiles/Releases/ReleaseProfileService.cs
+++ b/src/NzbDrone.Core/Profiles/Releases/ReleaseProfileService.cs
@@ -19,14 +19,11 @@ namespace NzbDrone.Core.Profiles.Releases
 
     public class ReleaseProfileService : IReleaseProfileService
     {
-        private readonly ReleaseProfilePreferredComparer _preferredComparer;
         private readonly IRestrictionRepository _repo;
         private readonly Logger _logger;
 
         public ReleaseProfileService(IRestrictionRepository repo, Logger logger)
         {
-            _preferredComparer = new ReleaseProfilePreferredComparer();
-
             _repo = repo;
             _logger = logger;
         }
@@ -34,7 +31,6 @@ namespace NzbDrone.Core.Profiles.Releases
         public List<ReleaseProfile> All()
         {
             var all = _repo.All().ToList();
-            all.ForEach(r => r.Preferred.Sort(_preferredComparer));
 
             return all;
         }
@@ -68,15 +64,11 @@ namespace NzbDrone.Core.Profiles.Releases
 
         public ReleaseProfile Add(ReleaseProfile restriction)
         {
-            restriction.Preferred.Sort(_preferredComparer);
-
             return _repo.Insert(restriction);
         }
 
         public ReleaseProfile Update(ReleaseProfile restriction)
         {
-            restriction.Preferred.Sort(_preferredComparer);
-
             return _repo.Update(restriction);
         }
     }
diff --git a/src/NzbDrone.Core/Profiles/Releases/TermMatchers/CaseInsensitiveTermMatcher.cs b/src/NzbDrone.Core/Profiles/Releases/TermMatchers/CaseInsensitiveTermMatcher.cs
index d8fa49120..5f02fe95f 100644
--- a/src/NzbDrone.Core/Profiles/Releases/TermMatchers/CaseInsensitiveTermMatcher.cs
+++ b/src/NzbDrone.Core/Profiles/Releases/TermMatchers/CaseInsensitiveTermMatcher.cs
@@ -2,10 +2,12 @@ namespace NzbDrone.Core.Profiles.Releases.TermMatchers
 {
     public sealed class CaseInsensitiveTermMatcher : ITermMatcher
     {
+        private readonly string _originalTerm;
         private readonly string _term;
 
         public CaseInsensitiveTermMatcher(string term)
         {
+            _originalTerm = term;
             _term = term.ToLowerInvariant();
         }
 
@@ -18,7 +20,7 @@ namespace NzbDrone.Core.Profiles.Releases.TermMatchers
         {
             if (value.ToLowerInvariant().Contains(_term))
             {
-                return _term;
+                return _originalTerm;
             }
 
             return null;
diff --git a/yarn.lock b/yarn.lock
index 657b3aca5..639710b52 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2171,6 +2171,11 @@ classnames@2.3.1:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
+classnames@^2.2.6:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
+
 clean-css@^4.2.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
@@ -4106,6 +4111,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+isnumeric@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isnumeric/-/isnumeric-0.2.0.tgz#a2347ba360de19e33d0ffd590fddf7755cbf2e64"
+  integrity sha512-uSJoAwnN1eCKDFKi8hL3UCYJSkQv+NwhKzhevUPIn/QZ8ILO21f+wQnlZHU0eh1rsLO1gI4w/HQdeOSTKwlqMg==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -4455,7 +4465,7 @@ lodash.upperfirst@4.3.1:
   resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
   integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=
 
-lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4791,7 +4801,7 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-normalize.css@8.0.1:
+normalize.css@8.0.1, normalize.css@^8.0.0:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
   integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
@@ -5588,6 +5598,16 @@ react-measure@1.4.7:
     prop-types "^15.5.4"
     resize-observer-polyfill "^1.4.1"
 
+react-middle-truncate@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/react-middle-truncate/-/react-middle-truncate-1.0.3.tgz#42d198ad9738bc2d8f7b8e77e11e02107b856fe1"
+  integrity sha512-rBYJjSYgAvNayDk+yZz8QhQqbGLjsSZV2CuGJ4g18o6BUGlMgZ4fIOGKuIEIZj17zCXzSw7mCGAcZ4lw0y8Lgw==
+  dependencies:
+    classnames "^2.2.6"
+    lodash "^4.17.15"
+    normalize.css "^8.0.0"
+    units-css "^0.4.0"
+
 react-popper@1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
@@ -6833,6 +6853,14 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
+units-css@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/units-css/-/units-css-0.4.0.tgz#d6228653a51983d7c16ff28f8b9dc3b1ffed3a07"
+  integrity sha512-WijzYC+chwzg2D6HmNGUSzPAgFRJfuxVyG9oiY28Ei5E+g6fHoPkhXUr5GV+5hE/RTHZNd9SuX2KLioYHdttoA==
+  dependencies:
+    isnumeric "^0.2.0"
+    viewport-dimensions "^0.2.0"
+
 universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -6931,6 +6959,11 @@ value-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
   integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
+viewport-dimensions@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz#de740747db5387fd1725f5175e91bac76afdf36c"
+  integrity sha512-94JqlKxEP4m7WO+N3rm4tFRGXZmXXwSPQCoV+EPxDnn8YAGiLU3T+Ha1imLreAjXsHl0K+ELnIqv64i1XZHLFQ==
+
 vscode-json-languageservice@^4.1.6:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz#94b6f471ece193bf4a1ef37f6ab5cce86d50a8b4"