From b04b4000b84a8a3ea8bb7b784fbbf9ff08451c6e 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>
---
 .../src/Activity/Blocklist/BlocklistRow.js    |  13 +
 .../History/Details/HistoryDetails.js         |  24 +-
 frontend/src/Activity/History/HistoryRow.css  |   2 +-
 frontend/src/Activity/History/HistoryRow.js   |  19 +-
 frontend/src/Activity/Queue/QueueRow.js       |  13 +
 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 ++++++
 .../src/Components/Link/ClipboardButton.js    |  16 +-
 .../Components/Page/Sidebar/PageSidebar.js    |   4 +
 frontend/src/Episode/EpisodeFormats.js        |  33 ++
 .../src/Episode/History/EpisodeHistory.js     |  11 +
 .../src/Episode/History/EpisodeHistoryRow.js  |  27 +
 frontend/src/Helpers/Props/icons.js           |   2 +
 frontend/src/Helpers/Props/inputTypes.js      |   2 +
 .../InteractiveSearch/InteractiveSearch.js    |   4 +-
 .../InteractiveSearchRow.css                  |   2 +-
 .../InteractiveSearch/InteractiveSearchRow.js |  30 +-
 frontend/src/Series/Details/EpisodeRow.js     |  16 +-
 .../src/Series/Details/EpisodeRowConnector.js |   1 +
 .../History/SeriesHistoryModalContent.js      |  11 +
 .../src/Series/History/SeriesHistoryRow.js    |  27 +
 .../CustomFormatSettingsConnector.js          |  32 ++
 .../CustomFormats/CustomFormat.css            |  38 ++
 .../CustomFormats/CustomFormat.js             | 173 ++++++
 .../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        |   4 +-
 .../MediaManagement/Naming/NamingModal.js     |   2 +-
 .../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 |  35 +-
 ...EditReleaseProfileModalContentConnector.js |   1 -
 .../Profiles/Release/ReleaseProfile.js        |  25 -
 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/episodeActions.js  |   5 +
 frontend/src/Store/Actions/historyActions.js  |  12 +-
 frontend/src/Store/Actions/queueActions.js    |   6 +
 frontend/src/Store/Actions/settingsActions.js |  10 +
 frontend/src/Utilities/State/getNextId.js     |   5 +
 .../src/Utilities/State/getProviderState.js   |  17 +-
 .../CustomFormats/CustomFormatsFixture.cs     |  34 ++
 .../171_add_custom_formatsFixture.cs          | 535 ++++++++++++++++++
 ...matAllowedByProfileSpecificationFixture.cs | 116 ++++
 .../CutoffSpecificationFixture.cs             | 456 ++++++++-------
 .../PrioritizeDownloadDecisionFixture.cs      |  28 +-
 .../QueueSpecificationFixture.cs              |  53 +-
 .../RssSync/DelaySpecificationFixture.cs      |   3 +-
 .../RssSync/HistorySpecificationFixture.cs    |  16 +-
 .../UpgradeDiskSpecificationFixture.cs        |  26 +-
 .../UpgradeSpecificationFixture.cs            |  24 +-
 .../MoveEpisodeFileFixture.cs                 |   4 +-
 ...isodeFilePreferredWordCalculatorFixture.cs | 152 -----
 .../UpgradeSpecificationFixture.cs            |  65 ++-
 .../FileNameBuilderTests/CleanTitleFixture.cs |   7 +-
 .../CleanTitleYearFixture.cs                  |   5 +
 .../EpisodeTitleCollapseFixture.cs            |   7 +-
 .../FileNameBuilderFixture.cs                 |   5 +
 .../MultiEpisodeFixture.cs                    |   5 +
 .../MultiEpisodeTitleFixture.cs               |   5 +
 .../OriginalTitleFixture.cs                   |   5 +
 .../PreferredWordsFixture.cs                  | 110 ----
 .../ReplaceCharacterFixure.cs                 |   7 +-
 .../ReservedDeviceNameFixture.cs              |   5 +
 .../FileNameBuilderTests/TitleTheFixture.cs   |   5 +
 .../TitleTheYearFixture.cs                    |   5 +
 .../FileNameBuilderTests/TitleYearFixture.cs  |   5 +
 .../TruncatedEpisodeTitlesFixture.cs          |   5 +
 .../Profiles/QualityProfileServiceFixture.cs  |   5 +
 .../PreferredWordService/CalculateFixture.cs  |  94 ---
 .../GetMatchingPreferredWordsFixture.cs       | 140 -----
 .../Annotations}/SelectOption.cs              |   2 +-
 .../Annotations/SelectOptionsConverter.cs     |   9 +
 .../CustomFormats/CustomFormat.cs             |  71 +++
 .../CustomFormatCalculationService.cs         | 148 +++++
 .../CustomFormats/CustomFormatRepository.cs   |  17 +
 .../CustomFormats/CustomFormatService.cs      |  77 +++
 .../Events/CustomFormatAddedEvent.cs          |  14 +
 .../Events/CustomFormatDeletedEvent.cs        |  14 +
 .../SpecificationMatchesGroup.cs              |  13 +
 .../CustomFormatSpecificationBase.cs          |  34 ++
 .../ICustomFormatSpecification.cs             |  17 +
 .../Specifications/RegexSpecificationBase.cs  |  32 ++
 .../ReleaseGroupSpecification.cs              |  16 +
 .../ReleaseTitleSpecification.cs              |  20 +
 .../Specifications/ResolutionSpecification.cs |  20 +
 .../Specifications/SizeSpecification.cs       |  26 +
 .../Specifications/SourceSpecification.cs     |  20 +
 .../Converters/CustomFormatIntConverter.cs    |  20 +
 .../CustomFormatSpecificationConverter.cs     |  74 +++
 .../Migration/171_add_custom_formats.cs       | 266 +++++++++
 src/NzbDrone.Core/Datastore/TableMapping.cs   |   6 +
 .../DownloadDecisionComparer.cs               |   6 +-
 .../DecisionEngine/DownloadDecisionMaker.cs   |   9 +-
 ...stomFormatAllowedByProfileSpecification.cs |  25 +
 .../Specifications/CutoffSpecification.cs     |  14 +-
 .../Specifications/QueueSpecification.cs      |  19 +-
 .../RssSync/HistorySpecification.cs           |  26 +-
 .../Specifications/UpgradableSpecification.cs |  30 +-
 .../UpgradeDiskSpecification.cs               |  15 +-
 .../AggregatePreferredWordScore.cs            |  22 -
 .../History/DownloadHistoryService.cs         |   2 +-
 .../TrackedDownloadService.cs                 |  10 +
 src/NzbDrone.Core/History/HistoryService.cs   |  10 +-
 .../EpisodeFilePreferredWordCalculator.cs     |  91 ---
 .../AggregatePreferredWordScore.cs            |  37 --
 .../Specifications/UpgradeSpecification.cs    |  50 +-
 .../Organizer/FileNameBuilder.cs              |  66 +--
 .../Organizer/FileNameSampleService.cs        |  37 +-
 .../Parser/Model/LocalEpisode.cs              |   1 -
 .../Parser/Model/ParsedEpisodeInfo.cs         |   5 +
 .../Parser/Model/RemoteEpisode.cs             |   5 +-
 .../Profiles/ProfileFormatItem.cs             |  14 +
 .../Profiles/Qualities/QualityProfile.cs      |  14 +
 .../Qualities/QualityProfileRepository.cs     |  30 +-
 .../Qualities/QualityProfileService.cs        |  58 +-
 .../Releases/PreferredWordMatchResults.cs     |  29 -
 .../Profiles/Releases/PreferredWordService.cs | 119 ----
 .../Profiles/Releases/ReleaseProfile.cs       |   4 -
 .../Releases/ReleaseProfileService.cs         |   8 -
 .../Blocklist/BlocklistController.cs          |   8 +-
 .../Blocklist/BlocklistResource.cs            |   8 +-
 .../CustomFormats/CustomFormatController.cs   | 143 +++++
 .../CustomFormats/CustomFormatResource.cs     |  58 ++
 .../CustomFormatSpecificationSchema.cs        |  36 ++
 .../EpisodeFiles/EpisodeFileController.cs     |  30 +-
 .../EpisodeFiles/EpisodeFileResource.cs       |   3 +
 .../History/HistoryController.cs              |   6 +-
 src/Sonarr.Api.V3/History/HistoryResource.cs  |   6 +-
 src/Sonarr.Api.V3/Indexers/ReleaseResource.cs |   7 +-
 .../Quality/QualityProfileController.cs       |  21 +-
 .../Quality/QualityProfileResource.cs         |  39 +-
 .../Release/ReleaseProfileController.cs       |   9 +-
 .../Release/ReleaseProfileResource.cs         |   7 -
 src/Sonarr.Api.V3/Queue/QueueResource.cs      |   3 +
 src/Sonarr.Http/ClientSchema/Field.cs         |   1 +
 173 files changed, 6401 insertions(+), 1347 deletions(-)
 create mode 100644 frontend/src/Components/Form/TextArea.css
 create mode 100644 frontend/src/Components/Form/TextArea.js
 create mode 100644 frontend/src/Episode/EpisodeFormats.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/State/getNextId.js
 create mode 100644 src/NzbDrone.Core.Test/CustomFormats/CustomFormatsFixture.cs
 create mode 100644 src/NzbDrone.Core.Test/Datastore/Migration/171_add_custom_formatsFixture.cs
 create mode 100644 src/NzbDrone.Core.Test/DecisionEngineTests/CustomFormatAllowedByProfileSpecificationFixture.cs
 delete mode 100644 src/NzbDrone.Core.Test/MediaFiles/EpisodeFilePreferredWordCalculatorFixture.cs
 delete mode 100644 src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/PreferredWordsFixture.cs
 delete mode 100644 src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/CalculateFixture.cs
 delete mode 100644 src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs
 rename src/{Sonarr.Http/ClientSchema => NzbDrone.Core/Annotations}/SelectOption.cs (84%)
 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/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/ResolutionSpecification.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
 create mode 100644 src/NzbDrone.Core/CustomFormats/Specifications/SourceSpecification.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/171_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
 delete mode 100644 src/NzbDrone.Core/MediaFiles/EpisodeFilePreferredWordCalculator.cs
 delete mode 100644 src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregatePreferredWordScore.cs
 create mode 100644 src/NzbDrone.Core/Profiles/ProfileFormatItem.cs
 delete mode 100644 src/NzbDrone.Core/Profiles/Releases/PreferredWordMatchResults.cs
 delete mode 100644 src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs
 create mode 100644 src/Sonarr.Api.V3/CustomFormats/CustomFormatController.cs
 create mode 100644 src/Sonarr.Api.V3/CustomFormats/CustomFormatResource.cs
 create mode 100644 src/Sonarr.Api.V3/CustomFormats/CustomFormatSpecificationSchema.cs

diff --git a/frontend/src/Activity/Blocklist/BlocklistRow.js b/frontend/src/Activity/Blocklist/BlocklistRow.js
index cea880fd4..571ba5d8d 100644
--- a/frontend/src/Activity/Blocklist/BlocklistRow.js
+++ b/frontend/src/Activity/Blocklist/BlocklistRow.js
@@ -5,6 +5,7 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
+import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import { icons, kinds } from 'Helpers/Props';
@@ -46,6 +47,7 @@ class BlocklistRow extends Component {
       sourceTitle,
       language,
       quality,
+      customFormats,
       date,
       protocol,
       indexer,
@@ -120,6 +122,16 @@ class BlocklistRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -185,6 +197,7 @@ BlocklistRow.propTypes = {
   sourceTitle: PropTypes.string.isRequired,
   language: PropTypes.object.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 0e52363ca..293c6d477 100644
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@@ -23,8 +23,8 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
-      preferredWordScore,
       seriesMatchType,
+      customFormatScore,
       nzbInfoUrl,
       downloadClient,
       downloadClientName,
@@ -65,10 +65,10 @@ function HistoryDetails(props) {
         }
 
         {
-          preferredWordScore && preferredWordScore !== '0' ?
+          customFormatScore && customFormatScore !== '0' ?
             <DescriptionListItem
-              title="Preferred Word Score"
-              data={formatPreferredWordScore(preferredWordScore)}
+              title="Custom Format Score"
+              data={formatPreferredWordScore(customFormatScore)}
             /> :
             null
         }
@@ -163,7 +163,7 @@ function HistoryDetails(props) {
 
   if (eventType === 'downloadFolderImported') {
     const {
-      preferredWordScore,
+      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -197,10 +197,10 @@ function HistoryDetails(props) {
         }
 
         {
-          preferredWordScore && preferredWordScore !== '0' ?
+          customFormatScore && customFormatScore !== '0' ?
             <DescriptionListItem
-              title="Preferred Word Score"
-              data={formatPreferredWordScore(preferredWordScore)}
+              title="Custom Format Score"
+              data={formatPreferredWordScore(customFormatScore)}
             /> :
             null
         }
@@ -211,7 +211,7 @@ function HistoryDetails(props) {
   if (eventType === 'episodeFileDeleted') {
     const {
       reason,
-      preferredWordScore
+      customFormatScore
     } = data;
 
     let reasonMessage = '';
@@ -243,10 +243,10 @@ function HistoryDetails(props) {
         />
 
         {
-          preferredWordScore && preferredWordScore !== '0' ?
+          customFormatScore && customFormatScore !== '0' ?
             <DescriptionListItem
-              title="Preferred Word Score"
-              data={formatPreferredWordScore(preferredWordScore)}
+              title="Custom Format Score"
+              data={formatPreferredWordScore(customFormatScore)}
             /> :
             null
         }
diff --git a/frontend/src/Activity/History/HistoryRow.css b/frontend/src/Activity/History/HistoryRow.css
index 07a392d71..039804b63 100644
--- a/frontend/src/Activity/History/HistoryRow.css
+++ b/frontend/src/Activity/History/HistoryRow.css
@@ -10,7 +10,7 @@
   width: 80px;
 }
 
-.preferredWordScore {
+.customFormatScore {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 55px;
diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js
index db16aec05..8ad1c07f7 100644
--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -5,6 +5,7 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import episodeEntities from 'Episode/episodeEntities';
+import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
@@ -61,6 +62,7 @@ class HistoryRow extends Component {
       language,
       languageCutoffNotMet,
       quality,
+      customFormats,
       qualityCutoffNotMet,
       eventType,
       sourceTitle,
@@ -164,6 +166,16 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -195,13 +207,13 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'preferredWordScore') {
+            if (name === 'customFormatScore') {
               return (
                 <TableRowCell
                   key={name}
-                  className={styles.preferredWordScore}
+                  className={styles.customFormatScore}
                 >
-                  {formatPreferredWordScore(data.preferredWordScore)}
+                  {formatPreferredWordScore(data.customFormatScore)}
                 </TableRowCell>
               );
             }
@@ -269,6 +281,7 @@ HistoryRow.propTypes = {
   language: PropTypes.object.isRequired,
   languageCutoffNotMet: PropTypes.bool.isRequired,
   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 b42a669b3..67b8b9b3c 100644
--- a/frontend/src/Activity/Queue/QueueRow.js
+++ b/frontend/src/Activity/Queue/QueueRow.js
@@ -8,6 +8,7 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
+import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
@@ -89,6 +90,7 @@ class QueueRow extends Component {
       episode,
       language,
       quality,
+      customFormats,
       protocol,
       indexer,
       outputPath,
@@ -247,6 +249,16 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'protocol') {
               return (
                 <TableRowCell key={name}>
@@ -400,6 +412,7 @@ QueueRow.propTypes = {
   episode: PropTypes.object,
   language: PropTypes.object.isRequired,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js
index ebee670e9..004d49381 100644
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -13,6 +13,7 @@ import SeasonPassConnector from 'SeasonPass/SeasonPassConnector';
 import SeriesDetailsPageConnector from 'Series/Details/SeriesDetailsPageConnector';
 import SeriesEditorConnector from 'Series/Editor/SeriesEditorConnector';
 import SeriesIndexConnector from 'Series/Index/SeriesIndexConnector';
+import CustomFormatSettingsConnector from 'Settings/CustomFormats/CustomFormatSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
 import ImportListSettingsConnector from 'Settings/ImportLists/ImportListSettingsConnector';
@@ -161,6 +162,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 4933e5376..5951520d5 100644
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -23,6 +23,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';
@@ -87,6 +88,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/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 e6d9991e7..f534b1ca3 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -103,6 +103,10 @@ const links = [
         title: 'Quality',
         to: '/settings/quality'
       },
+      {
+        title: 'Custom Formats',
+        to: '/settings/customformats'
+      },
       {
         title: 'Indexers',
         to: '/settings/indexers'
diff --git a/frontend/src/Episode/EpisodeFormats.js b/frontend/src/Episode/EpisodeFormats.js
new file mode 100644
index 000000000..1801767bd
--- /dev/null
+++ b/frontend/src/Episode/EpisodeFormats.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 EpisodeFormats({ formats }) {
+  return (
+    <div>
+      {
+        formats.map((format) => {
+          return (
+            <Label
+              key={format.id}
+              kind={kinds.INFO}
+            >
+              {format.name}
+            </Label>
+          );
+        })
+      }
+    </div>
+  );
+}
+
+EpisodeFormats.propTypes = {
+  formats: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+
+EpisodeFormats.defaultProps = {
+  formats: []
+};
+
+export default EpisodeFormats;
diff --git a/frontend/src/Episode/History/EpisodeHistory.js b/frontend/src/Episode/History/EpisodeHistory.js
index 5a7007ba8..e85c9589d 100644
--- a/frontend/src/Episode/History/EpisodeHistory.js
+++ b/frontend/src/Episode/History/EpisodeHistory.js
@@ -1,8 +1,10 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
+import { icons } from 'Helpers/Props';
 import EpisodeHistoryRow from './EpisodeHistoryRow';
 
 const columns = [
@@ -35,6 +37,15 @@ const columns = [
     label: 'Details',
     isVisible: true
   },
+  {
+    name: 'customFormatScore',
+    label: React.createElement(Icon, {
+      name: icons.SCORE,
+      title: 'Custom format score'
+    }),
+    isSortable: true,
+    isVisible: true
+  },
   {
     name: 'actions',
     label: 'Actions',
diff --git a/frontend/src/Episode/History/EpisodeHistoryRow.js b/frontend/src/Episode/History/EpisodeHistoryRow.js
index bc4c1aa2a..f6a824b28 100644
--- a/frontend/src/Episode/History/EpisodeHistoryRow.js
+++ b/frontend/src/Episode/History/EpisodeHistoryRow.js
@@ -3,15 +3,18 @@ import React, { Component } from 'react';
 import HistoryDetailsConnector from 'Activity/History/Details/HistoryDetailsConnector';
 import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
 import Icon from 'Components/Icon';
+import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 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 EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
 import styles from './EpisodeHistoryRow.css';
 
 function getTitle(eventType) {
@@ -66,6 +69,7 @@ class EpisodeHistoryRow extends Component {
       languageCutoffNotMet,
       quality,
       qualityCutoffNotMet,
+      customFormats,
       date,
       data
     } = this.props;
@@ -122,6 +126,28 @@ class EpisodeHistoryRow extends Component {
           />
         </TableRowCell>
 
+        <TableRowCell className={styles.customFormatScore}>
+          <Tooltip
+            anchor={
+              formatPreferredWordScore(data.customFormatScore)
+            }
+            tooltip={
+              <div>
+                {
+                  customFormats.map((format) => {
+                    return (
+                      <Label key={format.id}>
+                        {format.name}
+                      </Label>
+                    );
+                  })
+                }
+              </div>
+            }
+            position={tooltipPositions.BOTTOM}
+          />
+        </TableRowCell>
+
         <TableRowCell className={styles.actions}>
           {
             eventType === 'grabbed' &&
@@ -155,6 +181,7 @@ EpisodeHistoryRow.propTypes = {
   languageCutoffNotMet: PropTypes.bool.isRequired,
   quality: PropTypes.object.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
   onMarkAsFailedPress: PropTypes.func.isRequired
diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js
index b883c5924..c8df8817b 100644
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -52,6 +52,7 @@ import {
   faEye as fasEye,
   faFastBackward as fasFastBackward,
   faFastForward as fasFastForward,
+  faFileExport as fasFileExport,
   faFileInvoice as farFileInvoice,
   faFilter as fasFilter,
   faFolderOpen as fasFolderOpen,
@@ -133,6 +134,7 @@ export const EDIT = fasWrench;
 export const EPISODE_FILE = farFileVideo;
 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 f87033c9b..8bba563a2 100644
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -18,6 +18,7 @@ export const DYNAMIC_SELECT = 'dynamicSelect';
 export const SERIES_TYPE_SELECT = 'seriesTypeSelect';
 export const TAG = 'tag';
 export const TEXT = 'text';
+export const TEXT_AREA = 'textArea';
 export const TEXT_TAG = 'textTag';
 export const TAG_SELECT = 'tagSelect';
 export const UMASK = 'umask';
@@ -43,6 +44,7 @@ export const all = [
   SERIES_TYPE_SELECT,
   TAG,
   TEXT,
+  TEXT_AREA,
   TEXT_TAG,
   TAG_SELECT,
   UMASK
diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.js b/frontend/src/InteractiveSearch/InteractiveSearch.js
index 030404a64..da0921314 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearch.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearch.js
@@ -62,10 +62,10 @@ const columns = [
     isVisible: true
   },
   {
-    name: 'preferredWordScore',
+    name: 'customFormatScore',
     label: React.createElement(Icon, {
       name: icons.SCORE,
-      title: 'Preferred word score'
+      title: 'Custom format score'
     }),
     isSortable: true,
     isVisible: true
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.css b/frontend/src/InteractiveSearch/InteractiveSearchRow.css
index ce330dee1..4f7037ca6 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.css
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.css
@@ -34,7 +34,7 @@
   width: 100px;
 }
 
-.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 743bc0f1f..b0a7bed2b 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
@@ -2,12 +2,14 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import Icon from 'Components/Icon';
+import Label from 'Components/Label';
 import Link from 'Components/Link/Link';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
 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 EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
@@ -115,7 +117,8 @@ class InteractiveSearchRow extends Component {
       leechers,
       quality,
       language,
-      preferredWordScore,
+      customFormatScore,
+      customFormats,
       sceneMapping,
       seasonNumber,
       episodeNumbers,
@@ -193,8 +196,26 @@ class InteractiveSearchRow extends Component {
           <EpisodeQuality quality={quality} />
         </TableRowCell>
 
-        <TableRowCell className={styles.preferredWordScore}>
-          {formatPreferredWordScore(preferredWordScore)}
+        <TableRowCell className={styles.customFormatScore}>
+          <Tooltip
+            anchor={
+              formatPreferredWordScore(customFormatScore)
+            }
+            tooltip={
+              <div>
+                {
+                  customFormats.map((format) => {
+                    return (
+                      <Label key={format.id}>
+                        {format.name}
+                      </Label>
+                    );
+                  })
+                }
+              </div>
+            }
+            position={tooltipPositions.BOTTOM}
+          />
         </TableRowCell>
 
         <TableRowCell className={styles.rejected}>
@@ -266,7 +287,8 @@ InteractiveSearchRow.propTypes = {
   leechers: PropTypes.number,
   quality: PropTypes.object.isRequired,
   language: PropTypes.object.isRequired,
-  preferredWordScore: PropTypes.number.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
   sceneMapping: PropTypes.object,
   seasonNumber: PropTypes.number,
   episodeNumbers: PropTypes.arrayOf(PropTypes.number),
diff --git a/frontend/src/Series/Details/EpisodeRow.js b/frontend/src/Series/Details/EpisodeRow.js
index 3ee72d242..0806f7f59 100644
--- a/frontend/src/Series/Details/EpisodeRow.js
+++ b/frontend/src/Series/Details/EpisodeRow.js
@@ -4,6 +4,7 @@ import MonitorToggleButton from 'Components/MonitorToggleButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
+import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeNumber from 'Episode/EpisodeNumber';
 import EpisodeSearchCellConnector from 'Episode/EpisodeSearchCellConnector';
 import EpisodeStatusConnector from 'Episode/EpisodeStatusConnector';
@@ -68,6 +69,7 @@ class EpisodeRow extends Component {
       episodeFileRelativePath,
       episodeFileSize,
       releaseGroup,
+      customFormats,
       alternateTitles,
       columns
     } = this.props;
@@ -168,6 +170,16 @@ class EpisodeRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'language') {
               return (
                 <TableRowCell
@@ -328,6 +340,7 @@ EpisodeRow.propTypes = {
   episodeFileRelativePath: PropTypes.string,
   episodeFileSize: PropTypes.number,
   releaseGroup: PropTypes.string,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   mediaInfo: PropTypes.object,
   alternateTitles: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -335,7 +348,8 @@ EpisodeRow.propTypes = {
 };
 
 EpisodeRow.defaultProps = {
-  alternateTitles: []
+  alternateTitles: [],
+  customFormats: []
 };
 
 export default EpisodeRow;
diff --git a/frontend/src/Series/Details/EpisodeRowConnector.js b/frontend/src/Series/Details/EpisodeRowConnector.js
index 19a2a9f6b..6cfa67a4c 100644
--- a/frontend/src/Series/Details/EpisodeRowConnector.js
+++ b/frontend/src/Series/Details/EpisodeRowConnector.js
@@ -18,6 +18,7 @@ function createMapStateToProps() {
         episodeFileRelativePath: episodeFile ? episodeFile.relativePath : null,
         episodeFileSize: episodeFile ? episodeFile.size : null,
         releaseGroup: episodeFile ? episodeFile.releaseGroup : null,
+        customFormats: episodeFile ? episodeFile.customFormats : [],
         alternateTitles: series.alternateTitles
       };
     }
diff --git a/frontend/src/Series/History/SeriesHistoryModalContent.js b/frontend/src/Series/History/SeriesHistoryModalContent.js
index 274e526f4..dc6d07a81 100644
--- a/frontend/src/Series/History/SeriesHistoryModalContent.js
+++ b/frontend/src/Series/History/SeriesHistoryModalContent.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ModalBody from 'Components/Modal/ModalBody';
@@ -8,6 +9,7 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
+import { icons } from 'Helpers/Props';
 import SeasonNumber from 'Season/SeasonNumber';
 import SeriesHistoryRowConnector from './SeriesHistoryRowConnector';
 
@@ -46,6 +48,15 @@ const columns = [
     label: 'Details',
     isVisible: true
   },
+  {
+    name: 'customFormatScore',
+    label: React.createElement(Icon, {
+      name: icons.SCORE,
+      title: 'Custom format score'
+    }),
+    isSortable: true,
+    isVisible: true
+  },
   {
     name: 'actions',
     label: 'Actions',
diff --git a/frontend/src/Series/History/SeriesHistoryRow.js b/frontend/src/Series/History/SeriesHistoryRow.js
index 952cf6a67..a45495a9a 100644
--- a/frontend/src/Series/History/SeriesHistoryRow.js
+++ b/frontend/src/Series/History/SeriesHistoryRow.js
@@ -3,17 +3,20 @@ import React, { Component } from 'react';
 import HistoryDetailsConnector from 'Activity/History/Details/HistoryDetailsConnector';
 import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
 import Icon from 'Components/Icon';
+import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 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 EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeNumber from 'Episode/EpisodeNumber';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
 import styles from './SeriesHistoryRow.css';
 
 function getTitle(eventType) {
@@ -68,6 +71,7 @@ class SeriesHistoryRow extends Component {
       languageCutoffNotMet,
       quality,
       qualityCutoffNotMet,
+      customFormats,
       date,
       data,
       fullSeries,
@@ -142,6 +146,28 @@ class SeriesHistoryRow extends Component {
           />
         </TableRowCell>
 
+        <TableRowCell className={styles.customFormatScore}>
+          <Tooltip
+            anchor={
+              formatPreferredWordScore(data.customFormatScore)
+            }
+            tooltip={
+              <div>
+                {
+                  customFormats.map((format) => {
+                    return (
+                      <Label key={format.id}>
+                        {format.name}
+                      </Label>
+                    );
+                  })
+                }
+              </div>
+            }
+            position={tooltipPositions.BOTTOM}
+          />
+        </TableRowCell>
+
         <TableRowCell className={styles.actions}>
           {
             eventType === 'grabbed' &&
@@ -175,6 +201,7 @@ SeriesHistoryRow.propTypes = {
   languageCutoffNotMet: PropTypes.bool.isRequired,
   quality: PropTypes.object.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
   fullSeries: 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..ed030aa80
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.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;
+}
+
+.formats {
+  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/CustomFormat.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
new file mode 100644
index 000000000..7e77c27c8
--- /dev/null
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
@@ -0,0 +1,173 @@
+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>
+            <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
+                  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..e62593301
--- /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>
+                    {'Sonarr supports custom conditions against the release properties below.'}
+                  </div>
+                  <div>
+                    {'Visit the wiki for more details: '}
+                    <Link to="https://wiki.servarr.com/sonarr/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 d190dd9f6..4efada0cf 100644
--- a/frontend/src/Settings/MediaManagement/MediaManagement.js
+++ b/frontend/src/Settings/MediaManagement/MediaManagement.js
@@ -261,11 +261,11 @@ class MediaManagement extends Component {
                       name="downloadPropersAndRepacks"
                       helpTexts={[
                         'Whether or not to automatically upgrade to Propers/Repacks',
-                        'Use \'Do not Prefer\' to sort by preferred word score over propers/repacks'
+                        'Use \'Do not Prefer\' to sort by custom format score over propers/repacks'
                       ]}
                       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 01f101e0a..48d2c7be8 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -107,7 +107,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/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 b8fc66ffc..c42a1e3e6 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
@@ -14,11 +14,23 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds, sizes } from 'Helpers/Props';
 import dimensions from 'Styles/Variables/dimensions';
+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 {
 
   //
@@ -92,6 +104,7 @@ class EditQualityProfileModalContent extends Component {
       isSaving,
       saveError,
       qualities,
+      customFormats,
       item,
       isInUse,
       onInputChange,
@@ -107,7 +120,10 @@ class EditQualityProfileModalContent extends Component {
       name,
       upgradeAllowed,
       cutoff,
-      items
+      minFormatScore,
+      cutoffFormatScore,
+      items,
+      formatItems
     } = item;
 
     return (
@@ -189,6 +205,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 Sonarr will no longer grab episode releases"
+                                onChange={onInputChange}
+                              />
+                            </FormGroup>
+                        }
+
+                        <div className={styles.formatItemLarge}>
+                          {getCustomFormatRender(formatItems, ...otherProps)}
+                        </div>
                       </div>
 
                       <div className={styles.formGroupWrapper}>
@@ -200,6 +254,10 @@ class EditQualityProfileModalContent extends Component {
                           {...otherProps}
                         />
                       </div>
+
+                      <div className={styles.formatItemSmall}>
+                        {getCustomFormatRender(formatItems, otherProps)}
+                      </div>
                     </div>
                   </Form>
 
@@ -215,7 +273,7 @@ class EditQualityProfileModalContent extends Component {
         >
           <ModalFooter>
             {
-              id &&
+              id ?
                 <div
                   className={styles.deleteButtonContainer}
                   title={
@@ -231,7 +289,8 @@ class EditQualityProfileModalContent extends Component {
                   >
                     Delete
                   </Button>
-                </div>
+                </div> :
+                null
             }
 
             <Button
@@ -261,6 +320,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..a32c24042
--- /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="Sonarr 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 Sonarr 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 9c66b1cb4..ed2c04e87 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
@@ -33,8 +33,6 @@ function EditReleaseProfileModalContent(props) {
     enabled,
     required,
     ignored,
-    preferred,
-    includePreferredWhenRenaming,
     tags,
     indexerId
   } = item;
@@ -105,37 +103,6 @@ function EditReleaseProfileModalContent(props) {
             />
           </FormGroup>
 
-          <FormGroup>
-            <FormLabel>Preferred</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.KEY_VALUE_LIST}
-              name="preferred"
-              helpTexts={[
-                'The release will be preferred based on the each term\'s score (case insensitive)',
-                'A positive score will be more preferred',
-                'A negative score will be less preferred'
-              ]}
-              {...preferred}
-              keyPlaceholder="Term"
-              valuePlaceholder="Score"
-              onChange={onInputChange}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>Include Preferred when Renaming</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="includePreferredWhenRenaming"
-              helpText={indexerId.value === 0 ? 'Include in {Preferred Words} renaming format' : 'Only supported when Indexer is set to (All)'}
-              {...includePreferredWhenRenaming}
-              onChange={onInputChange}
-              isDisabled={indexerId.value !== 0}
-            />
-          </FormGroup>
-
           <FormGroup>
             <FormLabel>Indexer</FormLabel>
 
@@ -143,7 +110,7 @@ function EditReleaseProfileModalContent(props) {
               type={inputTypes.INDEXER_SELECT}
               name="indexerId"
               helpText="Specify what indexer the profile applies to"
-              helpTextWarning="Using a specific indexer with preferred words can lead to duplicate releases being grabbed"
+              helpTextWarning="Using a specific indexer with release profiles can lead to duplicate releases being grabbed"
               {...indexerId}
               includeAny={true}
               onChange={onInputChange}
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
index f9f30b7c5..b14d72269 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
@@ -11,7 +11,6 @@ const newReleaseProfile = {
   enabled: true,
   required: [],
   ignored: [],
-  preferred: [],
   includePreferredWhenRenaming: false,
   tags: [],
   indexerId: 0
diff --git a/frontend/src/Settings/Profiles/Release/ReleaseProfile.js b/frontend/src/Settings/Profiles/Release/ReleaseProfile.js
index 6d7268039..90116ffd9 100644
--- a/frontend/src/Settings/Profiles/Release/ReleaseProfile.js
+++ b/frontend/src/Settings/Profiles/Release/ReleaseProfile.js
@@ -60,7 +60,6 @@ class ReleaseProfile extends Component {
       enabled,
       required,
       ignored,
-      preferred,
       tags,
       indexerId,
       tagList,
@@ -112,28 +111,6 @@ class ReleaseProfile extends Component {
           }
         </div>
 
-        <div>
-          {
-            preferred.map((item) => {
-              const isPreferred = item.value >= 0;
-
-              return (
-                <Label
-                  className={styles.label}
-                  key={item.key}
-                  kind={isPreferred ? kinds.DEFAULT : kinds.WARNING}
-                >
-                  <MiddleTruncate
-                    text={`${item.key} ${isPreferred ? '+' : ''}${item.value}`}
-                    start={10}
-                    end={14}
-                  />
-                </Label>
-              );
-            })
-          }
-        </div>
-
         <div>
           {
             ignored.map((item) => {
@@ -212,7 +189,6 @@ ReleaseProfile.propTypes = {
   enabled: PropTypes.bool.isRequired,
   required: PropTypes.arrayOf(PropTypes.string).isRequired,
   ignored: PropTypes.arrayOf(PropTypes.string).isRequired,
-  preferred: PropTypes.arrayOf(PropTypes.object).isRequired,
   tags: PropTypes.arrayOf(PropTypes.number).isRequired,
   indexerId: PropTypes.number.isRequired,
   tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -224,7 +200,6 @@ ReleaseProfile.defaultProps = {
   enabled: true,
   required: [],
   ignored: [],
-  preferred: [],
   indexerId: 0
 };
 
diff --git a/frontend/src/Settings/Settings.js b/frontend/src/Settings/Settings.js
index b4fe195c7..a7c81db13 100644
--- a/frontend/src/Settings/Settings.js
+++ b/frontend/src/Settings/Settings.js
@@ -46,6 +46,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 6657b342f..5be0797cc 100644
--- a/frontend/src/Store/Actions/blocklistActions.js
+++ b/frontend/src/Store/Actions/blocklistActions.js
@@ -52,6 +52,12 @@ export const defaultState = {
       label: 'Quality',
       isVisible: true
     },
+    {
+      name: 'customFormats',
+      label: 'Formats',
+      isSortable: false,
+      isVisible: true
+    },
     {
       name: 'date',
       label: 'Date',
diff --git a/frontend/src/Store/Actions/episodeActions.js b/frontend/src/Store/Actions/episodeActions.js
index cd10f6521..d2b77a03a 100644
--- a/frontend/src/Store/Actions/episodeActions.js
+++ b/frontend/src/Store/Actions/episodeActions.js
@@ -99,6 +99,11 @@ export const defaultState = {
       label: 'Release Group',
       isVisible: false
     },
+    {
+      name: 'customFormats',
+      label: 'Formats',
+      isVisible: false
+    },
     {
       name: 'status',
       label: 'Status',
diff --git a/frontend/src/Store/Actions/historyActions.js b/frontend/src/Store/Actions/historyActions.js
index b481c71ea..85fe95208 100644
--- a/frontend/src/Store/Actions/historyActions.js
+++ b/frontend/src/Store/Actions/historyActions.js
@@ -61,6 +61,12 @@ export const defaultState = {
       label: 'Quality',
       isVisible: true
     },
+    {
+      name: 'customFormats',
+      label: 'Formats',
+      isSortable: false,
+      isVisible: true
+    },
     {
       name: 'date',
       label: 'Date',
@@ -88,11 +94,11 @@ export const defaultState = {
       isVisible: false
     },
     {
-      name: 'preferredWordScore',
-      columnLabel: 'Preferred Word Score',
+      name: 'customFormatScore',
+      columnLabel: 'Custom Format Score',
       label: React.createElement(Icon, {
         name: icons.SCORE,
-        title: 'Preferred word score'
+        title: 'Custom format score'
       }),
       isVisible: false
     },
diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js
index 350da9b0e..d5f89d2bc 100644
--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -98,6 +98,12 @@ export const defaultState = {
         isSortable: true,
         isVisible: true
       },
+      {
+        name: 'customFormats',
+        label: 'Formats',
+        isSortable: false,
+        isVisible: true
+      },
       {
         name: 'protocol',
         label: 'Protocol',
diff --git a/frontend/src/Store/Actions/settingsActions.js b/frontend/src/Store/Actions/settingsActions.js
index caf22baba..b33abfd69 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';
@@ -21,6 +23,8 @@ import releaseProfiles from './Settings/releaseProfiles';
 import remotePathMappings from './Settings/remotePathMappings';
 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';
@@ -52,6 +56,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,
@@ -91,6 +97,8 @@ export const toggleAdvancedSettings = createAction(TOGGLE_ADVANCED_SETTINGS);
 // Action Handlers
 
 export const actionHandlers = handleThunks({
+  ...customFormatSpecifications.actionHandlers,
+  ...customFormats.actionHandlers,
   ...delayProfiles.actionHandlers,
   ...downloadClients.actionHandlers,
   ...downloadClientOptions.actionHandlers,
@@ -121,6 +129,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/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/src/NzbDrone.Core.Test/CustomFormats/CustomFormatsFixture.cs b/src/NzbDrone.Core.Test/CustomFormats/CustomFormatsFixture.cs
new file mode 100644
index 000000000..bd1e8a815
--- /dev/null
+++ b/src/NzbDrone.Core.Test/CustomFormats/CustomFormatsFixture.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.CustomFormats
+{
+    [TestFixture]
+    public class CustomFormatsFixture : 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/171_add_custom_formatsFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/171_add_custom_formatsFixture.cs
new file mode 100644
index 000000000..e9ee1a3be
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/171_add_custom_formatsFixture.cs
@@ -0,0 +1,535 @@
+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
+                {
+                    Name = "Profile",
+                    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("Profile_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
+                {
+                    Name = "Profile",
+                    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
+                {
+                    Name = "Profile",
+                    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("Profile_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
+                {
+                    Name = "Profile",
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = new[]
+                    {
+                        "some",
+                        "words"
+                    }.ToJson(),
+                    Ignored = "[]",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = true,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var releaseProfiles = db.Query<ReleaseProfile171>("SELECT Id, Name FROM ReleaseProfiles");
+
+            releaseProfiles.Should().HaveCount(1);
+            releaseProfiles.First().Name.Should().Be("Profile");
+        }
+
+        [Test]
+        public void should_remove_release_profile_if_no_ignored_or_required()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Name = "Profile",
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        }
+                    }.ToJson(),
+                    Required = "[]",
+                    Ignored = "[]",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = true,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+            });
+
+            var releaseProfiles = db.Query<ReleaseProfile171>("SELECT Id, Name 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_cfs_same_named_release_profiles()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Name = "Some - Profile",
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        },
+                        new
+                        {
+                            Key = "x265",
+                            Value = 3
+                        }
+                    }.ToJson(),
+                    Required = "[]",
+                    Ignored = "[]",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Name = "Some - Profile",
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        },
+                        new
+                        {
+                            Key = "x265",
+                            Value = 3
+                        }
+                    }.ToJson(),
+                    Required = "[]",
+                    Ignored = "[]",
+                    Tags = "[]",
+                    IncludePreferredWhenRenaming = false,
+                    Enabled = true,
+                    IndexerId = 0
+                });
+
+                c.Insert.IntoTable("ReleaseProfiles").Row(new
+                {
+                    Name = "Some - Profile",
+                    Preferred = new[]
+                    {
+                        new
+                        {
+                            Key = "x264",
+                            Value = 2
+                        },
+                        new
+                        {
+                            Key = "x265",
+                            Value = 3
+                        }
+                    }.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(6);
+            customFormats.First().Name.Should().Be("Some - Profile_1_0");
+            customFormats.Last().Name.Should().Be("Some - Profile_3_1");
+            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
+                {
+                    Name = "Profile",
+                    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("Profile_1_0");
+            customFormats.Last().Name.Should().Be("Profile_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
+                {
+                    Name = "Profile",
+                    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
+                {
+                    Name = "Profile",
+                    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
+                {
+                    MultiEpisodeStyle = false,
+                    StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Preferred Words } {Quality Full}",
+                    DailyEpisodeFormat = "{Series Title} - {Air-Date} - {Episode Title} {Preferred.Words } {Quality Full}",
+                    AnimeEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Preferred_Words} {Quality Full}",
+                });
+            });
+
+            var customFormats = db.Query<NamingConfig171>("SELECT StandardEpisodeFormat, DailyEpisodeFormat, AnimeEpisodeFormat FROM NamingConfig");
+
+            customFormats.Should().HaveCount(1);
+            customFormats.First().StandardEpisodeFormat.Should().Be("{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Custom Formats } {Quality Full}");
+            customFormats.First().DailyEpisodeFormat.Should().Be("{Series Title} - {Air-Date} - {Episode Title} {Custom.Formats } {Quality Full}");
+            customFormats.First().AnimeEpisodeFormat.Should().Be("{Series Title} - S{season:00}E{episode:00} - {Custom_Formats} {Quality Full}");
+        }
+
+        private class NamingConfig171
+        {
+            public string StandardEpisodeFormat { get; set; }
+            public string DailyEpisodeFormat { get; set; }
+            public string AnimeEpisodeFormat { get; set; }
+        }
+
+        private class ReleaseProfile171
+        {
+            public int Id { get; set; }
+            public string Name { 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..84d3d3119
--- /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.Parser.Model;
+using NzbDrone.Core.Profiles.Qualities;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests
+{
+    [TestFixture]
+
+    public class CustomFormatAllowedByProfileSpecificationFixture : CoreTest<CustomFormatAllowedbyProfileSpecification>
+    {
+        private RemoteEpisode _remoteEpisode;
+
+        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 fakeSeries = Builder<Series>.CreateNew()
+                .With(c => c.QualityProfile = new QualityProfile
+                {
+                    Cutoff = Quality.Bluray1080p.Id,
+                    MinFormatScore = 1
+                })
+                .Build();
+
+            _remoteEpisode = new RemoteEpisode
+            {
+                Series = fakeSeries,
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+            };
+
+            CustomFormatsFixture.GivenCustomFormats(_format1, _format2);
+        }
+
+        [Test]
+        public void should_allow_if_format_score_greater_than_min()
+        {
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { _format1 };
+            _remoteEpisode.Series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name);
+            _remoteEpisode.CustomFormatScore = _remoteEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(_remoteEpisode.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_deny_if_format_score_not_greater_than_min()
+        {
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { _format2 };
+            _remoteEpisode.Series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name);
+            _remoteEpisode.CustomFormatScore = _remoteEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(_remoteEpisode.CustomFormats);
+
+            Console.WriteLine(_remoteEpisode.CustomFormatScore);
+            Console.WriteLine(_remoteEpisode.Series.QualityProfile.Value.MinFormatScore);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_deny_if_format_score_not_greater_than_min_2()
+        {
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { _format2, _format1 };
+            _remoteEpisode.Series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name);
+            _remoteEpisode.CustomFormatScore = _remoteEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(_remoteEpisode.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_allow_if_all_format_is_defined_in_profile()
+        {
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { _format2, _format1 };
+            _remoteEpisode.Series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteEpisode.CustomFormatScore = _remoteEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(_remoteEpisode.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_deny_if_no_format_was_parsed_and_min_score_positive()
+        {
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { };
+            _remoteEpisode.Series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteEpisode.CustomFormatScore = _remoteEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(_remoteEpisode.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_allow_if_no_format_was_parsed_min_score_is_zero()
+        {
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { };
+            _remoteEpisode.Series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteEpisode.Series.QualityProfile.Value.MinFormatScore = 0;
+            _remoteEpisode.CustomFormatScore = _remoteEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(_remoteEpisode.CustomFormats);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
index 41f7b4ebd..df8828cd5 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
@@ -1,367 +1,385 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
 using FluentAssertions;
+using Moq;
 using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Languages;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Test.Languages;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
 {
     [TestFixture]
-    public class CutoffSpecificationFixture : CoreTest<UpgradableSpecification>
+    public class CutoffSpecificationFixture : CoreTest<CutoffSpecification>
     {
-        private static readonly int NoPreferredWordScore = 0;
+        private CustomFormat _customFormat;
+        private RemoteEpisode _remoteMovie;
+
+        [SetUp]
+        public void Setup()
+        {
+            Mocker.SetConstant<IUpgradableSpecification>(Mocker.Resolve<UpgradableSpecification>());
+
+            _remoteMovie = new RemoteEpisode()
+            {
+                Series = Builder<Series>.CreateNew().Build(),
+                Episodes = new List<Episode> { Builder<Episode>.CreateNew().Build() },
+                ParsedEpisodeInfo = Builder<ParsedEpisodeInfo>.CreateNew().With(x => x.Quality = null).Build()
+            };
+
+            GivenOldCustomFormats(new List<CustomFormat>());
+        }
+
+        private void GivenProfile(QualityProfile profile)
+        {
+            CustomFormatsFixture.GivenCustomFormats();
+            profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems();
+            profile.MinFormatScore = 0;
+            _remoteMovie.Series.QualityProfile = profile;
+
+            Console.WriteLine(profile.ToJson());
+        }
+
+        private void GivenLanguageProfile(LanguageProfile profile)
+        {
+            _remoteMovie.Series.LanguageProfile = profile;
+
+            Console.WriteLine(profile.ToJson());
+        }
+
+        private void GivenFileQuality(QualityModel quality, Language language)
+        {
+            _remoteMovie.Episodes.First().EpisodeFile = Builder<EpisodeFile>.CreateNew().With(x => x.Quality = quality).With(x => x.Language = language).Build();
+        }
+
+        private void GivenNewQuality(QualityModel quality)
+        {
+            _remoteMovie.ParsedEpisodeInfo.Quality = quality;
+        }
+
+        private void GivenOldCustomFormats(List<CustomFormat> formats)
+        {
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                .Setup(x => x.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                .Returns(formats);
+        }
+
+        private void GivenNewCustomFormats(List<CustomFormat> formats)
+        {
+            _remoteMovie.CustomFormats = formats;
+        }
+
+        private void GivenCustomFormatHigher()
+        {
+            _customFormat = new CustomFormat("My Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 1 };
+
+            CustomFormatsFixture.GivenCustomFormats(_customFormat);
+        }
 
         [Test]
         public void should_return_true_if_current_episode_is_less_than_cutoff()
         {
-            Subject.CutoffNotMet(
-                new QualityProfile
-                {
-                    Cutoff = Quality.Bluray1080p.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
-                new LanguageProfile
-                {
-                    Languages = LanguageFixture.GetDefaultLanguages(Language.English),
-                    Cutoff = Language.English,
-                    UpgradeAllowed = true
-                },
-                new QualityModel(Quality.DVD, new Revision(version: 2)),
-                Language.English,
-                NoPreferredWordScore).Should().BeTrue();
+            GivenProfile(new QualityProfile
+            {
+                Cutoff = Quality.Bluray1080p.Id,
+                Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = true
+            });
+
+            GivenLanguageProfile(new LanguageProfile
+            {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English,
+                UpgradeAllowed = true
+            });
+
+            GivenFileQuality(new QualityModel(Quality.DVD, new Revision(version: 2)), Language.English);
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_false_if_current_episode_is_equal_to_cutoff()
         {
-            Subject.CutoffNotMet(
-                new QualityProfile
-                {
-                    Cutoff = Quality.HDTV720p.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
-                new LanguageProfile
-                {
-                    Languages = LanguageFixture.GetDefaultLanguages(Language.English),
-                    Cutoff = Language.English,
-                    UpgradeAllowed = true
-                },
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                Language.English,
-                NoPreferredWordScore).Should().BeFalse();
+            GivenProfile(new QualityProfile
+            {
+                Cutoff = Quality.HDTV720p.Id,
+                Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = true
+            });
+
+            GivenLanguageProfile(new LanguageProfile
+            {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English,
+                UpgradeAllowed = true
+            });
+
+            GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.English);
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_false_if_current_episode_is_greater_than_cutoff()
         {
-            Subject.CutoffNotMet(
-                new QualityProfile
-                {
-                    Cutoff = Quality.HDTV720p.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
-                new LanguageProfile
-                {
-                    Languages = LanguageFixture.GetDefaultLanguages(Language.English),
-                    Cutoff = Language.English,
-                    UpgradeAllowed = true
-                },
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                Language.English,
-                NoPreferredWordScore).Should().BeFalse();
+            GivenProfile(new QualityProfile
+            {
+                Cutoff = Quality.HDTV720p.Id,
+                Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = true
+            });
+
+            GivenLanguageProfile(new LanguageProfile
+            {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English,
+                UpgradeAllowed = true
+            });
+
+            GivenFileQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), Language.English);
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_true_when_new_episode_is_proper_but_existing_is_not()
         {
-            Subject.CutoffNotMet(
-                new QualityProfile
-                {
-                    Cutoff = Quality.HDTV720p.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
-                new LanguageProfile
-                {
-                    Languages = LanguageFixture.GetDefaultLanguages(Language.English),
-                    Cutoff = Language.English,
-                    UpgradeAllowed = true
-                },
-                new QualityModel(Quality.HDTV720p, new Revision(version: 1)),
-                Language.English,
-                NoPreferredWordScore,
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeTrue();
+            GivenProfile(new QualityProfile
+            {
+                Cutoff = Quality.HDTV720p.Id,
+                Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = true
+            });
+
+            GivenLanguageProfile(new LanguageProfile
+            {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English,
+                UpgradeAllowed = true
+            });
+
+            GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 1)), Language.English);
+            GivenNewQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)));
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_false_if_cutoff_is_met_and_quality_is_higher()
         {
-            Subject.CutoffNotMet(
-                new QualityProfile
-                {
-                    Cutoff = Quality.HDTV720p.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    UpgradeAllowed = true
-                },
-                new LanguageProfile
-                {
-                    Languages = LanguageFixture.GetDefaultLanguages(Language.English),
-                    Cutoff = Language.English,
-                    UpgradeAllowed = true
-                },
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                Language.English,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeFalse();
+            GivenProfile(new QualityProfile
+            {
+                Cutoff = Quality.HDTV720p.Id,
+                Items = Qualities.QualityFixture.GetDefaultQualities(),
+                UpgradeAllowed = true
+            });
+
+            GivenLanguageProfile(new LanguageProfile
+            {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English,
+                UpgradeAllowed = true
+            });
+
+            GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.English);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)));
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_true_if_quality_cutoff_is_met_and_quality_is_higher_but_language_is_not_met()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
-                Cutoff = Language.Spanish,
                 Languages = LanguageFixture.GetDefaultLanguages(),
+                Cutoff = Language.Spanish,
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(profile,
-                langProfile,
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                Language.English,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeTrue();
+            GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.English);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)));
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
-        public void should_return_false_if_cutoff_is_met_and_quality_is_higher_and_language_is_met()
+        public void should_return_false_if_quality_cutoff_is_met_and_quality_is_higher_but_language_is_met()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
-                Cutoff = Language.Spanish,
                 Languages = LanguageFixture.GetDefaultLanguages(),
+                Cutoff = Language.Spanish,
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                Language.Spanish,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeFalse();
+            GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.Spanish);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)));
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_false_if_cutoff_is_met_and_quality_is_higher_and_language_is_higher()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
-                Cutoff = Language.Spanish,
                 Languages = LanguageFixture.GetDefaultLanguages(),
+                Cutoff = Language.Spanish,
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                Language.French,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeFalse();
+            GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.French);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)));
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_true_if_cutoff_is_not_met_and_new_quality_is_higher_and_language_is_higher()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
-                Cutoff = Language.Spanish,
                 Languages = LanguageFixture.GetDefaultLanguages(),
+                Cutoff = Language.Spanish,
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.SDTV, new Revision(version: 2)),
-                Language.French,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeTrue();
+            GivenFileQuality(new QualityModel(Quality.SDTV, new Revision(version: 2)), Language.French);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)));
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_if_cutoff_is_not_met_and_language_is_higher()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
-                Cutoff = Language.Spanish,
                 Languages = LanguageFixture.GetDefaultLanguages(),
+                Cutoff = Language.Spanish,
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.SDTV, new Revision(version: 2)),
-                Language.French,
-                NoPreferredWordScore).Should().BeTrue();
+            GivenFileQuality(new QualityModel(Quality.SDTV, new Revision(version: 2)), Language.French);
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
-        public void should_return_true_if_cutoffs_are_met_and_score_is_higher()
+        public void should_return_false_if_custom_formats_is_met_and_quality_and_format_higher()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
+                MinFormatScore = 0,
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems("My Format"),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
-                Cutoff = Language.Spanish,
-                Languages = LanguageFixture.GetDefaultLanguages(),
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English,
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                Language.Spanish,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p, new Revision(version: 2)),
-                10).Should().BeTrue();
+            GivenFileQuality(new QualityModel(Quality.HDTV720p), Language.English);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p));
+
+            GivenCustomFormatHigher();
+
+            GivenOldCustomFormats(new List<CustomFormat>());
+            GivenNewCustomFormats(new List<CustomFormat> { _customFormat });
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_true_if_cutoffs_are_met_but_is_a_revision_upgrade()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
                 Cutoff = Quality.HDTV1080p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = true
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
                 Cutoff = Language.English,
-                Languages = LanguageFixture.GetDefaultLanguages(),
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.WEBDL1080p, new Revision(version: 1)),
-                Language.English,
-                NoPreferredWordScore,
-                new QualityModel(Quality.WEBDL1080p, new Revision(version: 2)),
-                NoPreferredWordScore).Should().BeTrue();
+            GivenFileQuality(new QualityModel(Quality.WEBDL1080p, new Revision(version: 1)), Language.English);
+            GivenNewQuality(new QualityModel(Quality.WEBDL1080p, new Revision(version: 2)));
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
-        public void should_return_false_if_language_profile_does_not_allow_upgrades_but_cutoff_is_set_to_highest_language_and_quality_cutoff_is_met()
+        public void should_return_false_if_quality_profile_does_not_allow_upgrades_but_cutoff_is_set_to_highest_quality()
         {
-            QualityProfile profile = new QualityProfile
+            GivenProfile(new QualityProfile
             {
-                Cutoff = Quality.WEBDL1080p.Id,
-                Items = Qualities.QualityFixture.GetDefaultQualities(),
-                UpgradeAllowed = true
-            };
-
-            LanguageProfile langProfile = new LanguageProfile
-            {
-                Cutoff = Language.Arabic,
-                Languages = LanguageFixture.GetDefaultLanguages(Language.Spanish, Language.English, Language.Arabic),
-                UpgradeAllowed = false
-            };
-
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.WEBDL1080p),
-                Language.English,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p),
-                NoPreferredWordScore).Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_false_if_quality_profile_does_not_allow_upgrades_but_cutoff_is_set_to_highest_quality_and_language_cutoff_is_met()
-        {
-            QualityProfile profile = new QualityProfile
-            {
-                Cutoff = Quality.WEBDL1080p.Id,
+                Cutoff = Quality.RAWHD.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 UpgradeAllowed = false
-            };
+            });
 
-            LanguageProfile langProfile = new LanguageProfile
+            GivenLanguageProfile(new LanguageProfile
             {
+                Languages = LanguageFixture.GetDefaultLanguages(Language.English),
                 Cutoff = Language.English,
-                Languages = LanguageFixture.GetDefaultLanguages(Language.Spanish, Language.English, Language.Arabic),
                 UpgradeAllowed = true
-            };
+            });
 
-            Subject.CutoffNotMet(
-                profile,
-                langProfile,
-                new QualityModel(Quality.WEBDL1080p),
-                Language.English,
-                NoPreferredWordScore,
-                new QualityModel(Quality.Bluray1080p),
-                NoPreferredWordScore).Should().BeFalse();
+            GivenFileQuality(new QualityModel(Quality.WEBDL1080p), Language.English);
+            GivenNewQuality(new QualityModel(Quality.Bluray1080p));
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
     }
 }
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
index 890a0ceac..f7129eabf 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
@@ -471,15 +471,15 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p), Language.English);
             var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p), Language.English);
 
-            remoteEpisode1.PreferredWordScore = 10;
-            remoteEpisode2.PreferredWordScore = 0;
+            remoteEpisode1.CustomFormatScore = 10;
+            remoteEpisode2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
             decisions.Add(new DownloadDecision(remoteEpisode2));
 
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
-            qualifiedReports.First().RemoteEpisode.PreferredWordScore.Should().Be(10);
+            qualifiedReports.First().RemoteEpisode.CustomFormatScore.Should().Be(10);
         }
 
         [Test]
@@ -492,8 +492,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(1)), Language.English);
             var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(2)), Language.English);
 
-            remoteEpisode1.PreferredWordScore = 10;
-            remoteEpisode2.PreferredWordScore = 0;
+            remoteEpisode1.CustomFormatScore = 10;
+            remoteEpisode2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -513,8 +513,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(1)), Language.English);
             var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(2)), Language.English);
 
-            remoteEpisode1.PreferredWordScore = 10;
-            remoteEpisode2.PreferredWordScore = 0;
+            remoteEpisode1.CustomFormatScore = 10;
+            remoteEpisode2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -534,8 +534,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(1)), Language.English);
             var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(2)), Language.English);
 
-            remoteEpisode1.PreferredWordScore = 10;
-            remoteEpisode2.PreferredWordScore = 0;
+            remoteEpisode1.CustomFormatScore = 10;
+            remoteEpisode2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -544,7 +544,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
             qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Quality.Should().Be(Quality.WEBDL1080p);
             qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Revision.Version.Should().Be(1);
-            qualifiedReports.First().RemoteEpisode.PreferredWordScore.Should().Be(10);
+            qualifiedReports.First().RemoteEpisode.CustomFormatScore.Should().Be(10);
         }
 
         [Test]
@@ -557,8 +557,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(1, 0)), Language.English);
             var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.WEBDL1080p, new Revision(1, 1)), Language.English);
 
-            remoteEpisode1.PreferredWordScore = 10;
-            remoteEpisode2.PreferredWordScore = 0;
+            remoteEpisode1.CustomFormatScore = 10;
+            remoteEpisode2.CustomFormatScore = 0;
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -568,7 +568,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Quality.Should().Be(Quality.WEBDL1080p);
             qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Revision.Version.Should().Be(1);
             qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Revision.Real.Should().Be(0);
-            qualifiedReports.First().RemoteEpisode.PreferredWordScore.Should().Be(10);
+            qualifiedReports.First().RemoteEpisode.CustomFormatScore.Should().Be(10);
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
index 63af2dbd9..b00ed8026 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
@@ -2,15 +2,19 @@ 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.Languages;
+using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Queue;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 
@@ -33,11 +37,15 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             Mocker.Resolve<UpgradableSpecification>();
 
+            CustomFormatsFixture.GivenCustomFormats();
+
             _series = Builder<Series>.CreateNew()
                                      .With(e => e.QualityProfile = new QualityProfile
                                                                 {
                                                                     UpgradeAllowed = true,
-                                                                    Items = Qualities.QualityFixture.GetDefaultQualities()
+                                                                    Items = Qualities.QualityFixture.GetDefaultQualities(),
+                                                                    FormatItems = CustomFormatsFixture.GetSampleFormatItems(),
+                                                                    MinFormatScore = 0
                                                                 })
                                      .With(l => l.LanguageProfile = new LanguageProfile
                                                                 {
@@ -69,8 +77,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                    .With(r => r.Series = _series)
                                                    .With(r => r.Episodes = new List<Episode> { _episode })
                                                    .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD), Language = Language.Spanish })
-                                                   .With(r => r.PreferredWordScore = 0)
+                                                   .With(r => r.CustomFormats = new List<CustomFormat>())
                                                    .Build();
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<ParsedEpisodeInfo>()))
+                  .Returns(new List<CustomFormat>());
         }
 
         private void GivenEmptyQueue()
@@ -80,6 +92,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<ParsedEpisodeInfo>()))
+                  .Returns(formats);
+        }
+
         private void GivenQueue(IEnumerable<RemoteEpisode> remoteEpisodes, TrackedDownloadState trackedDownloadState = TrackedDownloadState.Downloading)
         {
             var queue = remoteEpisodes.Select(remoteEpisode => new Queue.Queue
@@ -107,6 +126,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                       .With(r => r.Series = _otherSeries)
                                                       .With(r => r.Episodes = new List<Episode> { _episode })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -126,6 +146,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Quality = new QualityModel(Quality.DVD),
                     Language = Language.Spanish
                 })
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .With(r => r.Release = _releaseInfo)
                 .Build();
 
@@ -149,6 +170,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                                                            Language = Language.Spanish
                                                                                        })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -170,6 +192,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Language = Language.English
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -187,6 +210,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                                                            Quality = new QualityModel(Quality.DVD)
                                                                                        })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -194,9 +218,17 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         }
 
         [Test]
-        public void should_return_true_when_qualities_are_the_same_and_languages_are_the_same_with_higher_preferred_word_score()
+        public void should_return_true_when_qualities_are_the_same_and_languages_are_the_same_with_higher_custom_format_score()
         {
-            _remoteEpisode.PreferredWordScore = 1;
+            _remoteEpisode.CustomFormats = new List<CustomFormat> { new CustomFormat("My Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 1 } };
+
+            var lowFormat = new List<CustomFormat> { new CustomFormat("Bad Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 2 } };
+
+            CustomFormatsFixture.GivenCustomFormats(_remoteEpisode.CustomFormats.First(), lowFormat.First());
+
+            _series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems("My Format");
+
+            GivenQueueFormats(lowFormat);
 
             var remoteEpisode = Builder<RemoteEpisode>.CreateNew()
                 .With(r => r.Series = _series)
@@ -207,6 +239,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Language = Language.Spanish,
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = lowFormat)
                 .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -225,6 +258,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                                                            Language = Language.Spanish,
                                                                                        })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -243,6 +277,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Language = Language.English,
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -264,6 +299,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Language = Language.English
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -284,6 +320,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                                                            Language = Language.English
                                                                                        })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -302,6 +339,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Language = Language.English
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -320,6 +358,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Language = Language.English
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             _remoteEpisode.Episodes.Add(_otherEpisode);
@@ -340,6 +379,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Language = Language.English
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             _remoteEpisode.Episodes.Add(_otherEpisode);
@@ -354,6 +394,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var remoteEpisodes = Builder<RemoteEpisode>.CreateListOfSize(2)
                                                        .All()
                                                        .With(r => r.Series = _series)
+                                                       .With(r => r.CustomFormats = new List<CustomFormat>())
                                                        .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                                                         {
                                                                                             Quality =
@@ -387,6 +428,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                           Language = Language.Spanish
                                                       })
                                                       .With(r => r.Release = _releaseInfo)
+                                                      .With(r => r.CustomFormats = new List<CustomFormat>())
                                                       .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -408,6 +450,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Language = Language.English
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -429,6 +472,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Language = Language.Spanish
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode });
@@ -449,6 +493,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                     Language = Language.Spanish
                 })
                 .With(r => r.Release = _releaseInfo)
+                .With(r => r.CustomFormats = new List<CustomFormat>())
                 .Build();
 
             GivenQueue(new List<RemoteEpisode> { remoteEpisode }, TrackedDownloadState.FailedPending);
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
index 4d9c92e11..c75c301a9 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;
@@ -93,7 +94,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
         private void GivenUpgradeForExistingFile()
         {
             Mocker.GetMock<IUpgradableSpecification>()
-                  .Setup(s => s.IsUpgradable(It.IsAny<QualityProfile>(), It.IsAny<LanguageProfile>(), It.IsAny<QualityModel>(), It.IsAny<Language>(), It.IsAny<int>(), It.IsAny<QualityModel>(), It.IsAny<Language>(), It.IsAny<int>()))
+                  .Setup(s => s.IsUpgradable(It.IsAny<QualityProfile>(), It.IsAny<LanguageProfile>(), It.IsAny<QualityModel>(), It.IsAny<Language>(), It.IsAny<List<CustomFormat>>(), It.IsAny<QualityModel>(), It.IsAny<Language>(), It.IsAny<List<CustomFormat>>()))
                   .Returns(true);
         }
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/HistorySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/HistorySpecificationFixture.cs
index 04a380274..7a78f9e6d 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/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;
@@ -14,6 +15,7 @@ using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Test.Languages;
 using NzbDrone.Core.Tv;
@@ -40,6 +42,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             Mocker.Resolve<UpgradableSpecification>();
             _upgradeHistory = Mocker.Resolve<HistorySpecification>();
 
+            CustomFormatsFixture.GivenCustomFormats();
+
             var singleEpisodeList = new List<Episode> { new Episode { Id = FIRST_EPISODE_ID, SeasonNumber = 12, EpisodeNumber = 3 } };
             var doubleEpisodeList = new List<Episode>
             {
@@ -53,6 +57,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
                 {
                     UpgradeAllowed = true,
                     Cutoff = Quality.Bluray1080p.Id,
+                    FormatItems = CustomFormatsFixture.GetSampleFormatItems("None"),
+                    MinFormatScore = 0,
                     Items = Qualities.QualityFixture.GetDefaultQualities()
                 })
                 .With(l => l.LanguageProfile = new LanguageProfile
@@ -67,14 +73,16 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             {
                 Series = _fakeSeries,
                 ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)), Language = Language.English },
-                Episodes = doubleEpisodeList
+                Episodes = doubleEpisodeList,
+                CustomFormats = new List<CustomFormat>()
             };
 
             _parseResultSingle = new RemoteEpisode
             {
                 Series = _fakeSeries,
                 ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)), Language = Language.English },
-                Episodes = singleEpisodeList
+                Episodes = singleEpisodeList,
+                CustomFormats = new List<CustomFormat>()
             };
 
             _upgradableQuality = new Tuple<QualityModel, Language>(new QualityModel(Quality.SDTV, new Revision(version: 1)), Language.English);
@@ -84,6 +92,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             Mocker.GetMock<IConfigService>()
                   .SetupGet(s => s.EnableCompletedDownloadHandling)
                   .Returns(true);
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<EpisodeHistory>()))
+                  .Returns(new List<CustomFormat>());
         }
 
         private void GivenMostRecentForEpisode(int episodeId, string downloadId, Tuple<QualityModel, Language> quality, DateTime date, EpisodeHistoryEventType eventType)
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
index aed59f39e..5e52407da 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
@@ -4,6 +4,7 @@ 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.Languages;
@@ -12,6 +13,7 @@ using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 
@@ -34,6 +36,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.Resolve<UpgradableSpecification>();
             _upgradeDisk = Mocker.Resolve<UpgradeDiskSpecification>();
 
+            CustomFormatsFixture.GivenCustomFormats();
+
             _firstFile = new EpisodeFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), DateAdded = DateTime.Now, Language = Language.English };
             _secondFile = new EpisodeFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), DateAdded = DateTime.Now, Language = Language.English };
 
@@ -47,7 +51,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 {
                     UpgradeAllowed = true,
                     Cutoff = Quality.Bluray1080p.Id,
-                    Items = Qualities.QualityFixture.GetDefaultQualities()
+                    Items = Qualities.QualityFixture.GetDefaultQualities(),
+                    FormatItems = CustomFormatsFixture.GetSampleFormatItems("None"),
+                    MinFormatScore = 0,
                 })
                 .With(l => l.LanguageProfile = new LanguageProfile
                 {
@@ -61,15 +67,21 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             {
                 Series = fakeSeries,
                 ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)), Language = Language.English },
-                Episodes = doubleEpisodeList
+                Episodes = doubleEpisodeList,
+                CustomFormats = new List<CustomFormat>()
             };
 
             _parseResultSingle = new RemoteEpisode
             {
                 Series = fakeSeries,
                 ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)), Language = Language.English },
-                Episodes = singleEpisodeList
+                Episodes = singleEpisodeList,
+                CustomFormats = new List<CustomFormat>()
             };
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(x => x.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
         }
 
         private void WithFirstFileUpgradable()
@@ -143,11 +155,11 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_not_be_upgradable_if_revision_downgrade_and_preferred_word_upgrade_if_propers_are_preferred()
         {
-            Mocker.GetMock<IEpisodeFilePreferredWordCalculator>()
-                  .Setup(s => s.Calculate(It.IsAny<Series>(), It.IsAny<EpisodeFile>()))
-                  .Returns(5);
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
 
-            _parseResultSingle.PreferredWordScore = 10;
+            _parseResultSingle.CustomFormatScore = 10;
 
             _firstFile.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2));
             _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p);
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs
index f73def46b..d79bfe5c3 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs
@@ -1,6 +1,8 @@
+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.Languages;
 using NzbDrone.Core.Profiles.Languages;
@@ -36,8 +38,6 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             new object[] { Quality.WEBDL720p, 1, Language.Spanish, Quality.HDTV720p, 2, Language.French, Quality.WEBDL720p, Language.Spanish, false }
         };
 
-        private static readonly int NoPreferredWordScore = 0;
-
         private void GivenAutoDownloadPropers(ProperDownloadTypes type)
         {
             Mocker.GetMock<IConfigService>()
@@ -69,10 +69,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                        langProfile,
                        new QualityModel(current, new Revision(version: currentVersion)),
                        Language.English,
-                       NoPreferredWordScore,
+                       new List<CustomFormat>(),
                        new QualityModel(newQuality, new Revision(version: newVersion)),
                        Language.English,
-                       NoPreferredWordScore)
+                       new List<CustomFormat>())
                     .Should().Be(expected);
         }
 
@@ -101,10 +101,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                        langProfile,
                        new QualityModel(current, new Revision(version: currentVersion)),
                        currentLanguage,
-                       NoPreferredWordScore,
+                       new List<CustomFormat>(),
                        new QualityModel(newQuality, new Revision(version: newVersion)),
                        newLanguage,
-                       NoPreferredWordScore)
+                       new List<CustomFormat>())
                     .Should().Be(expected);
         }
 
@@ -129,10 +129,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                        langProfile,
                        new QualityModel(Quality.DVD, new Revision(version: 1)),
                        Language.English,
-                       NoPreferredWordScore,
+                       new List<CustomFormat>(),
                        new QualityModel(Quality.DVD, new Revision(version: 2)),
                        Language.English,
-                       NoPreferredWordScore)
+                       new List<CustomFormat>())
                     .Should().BeTrue();
         }
 
@@ -157,10 +157,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                        langProfile,
                        new QualityModel(Quality.DVD, new Revision(version: 1)),
                        Language.English,
-                       NoPreferredWordScore,
+                       new List<CustomFormat>(),
                        new QualityModel(Quality.DVD, new Revision(version: 2)),
                        Language.English,
-                       NoPreferredWordScore)
+                       new List<CustomFormat>())
                    .Should().BeFalse();
         }
 
@@ -183,10 +183,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                        langProfile,
                        new QualityModel(Quality.HDTV720p, new Revision(version: 1)),
                        Language.English,
-                       NoPreferredWordScore,
+                       new List<CustomFormat>(),
                        new QualityModel(Quality.HDTV720p, new Revision(version: 1)),
                        Language.English,
-                       NoPreferredWordScore)
+                       new List<CustomFormat>())
                    .Should().BeFalse();
         }
     }
diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs
index 360b122ea..f8575915d 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs
@@ -6,12 +6,12 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeFileMovingServiceTests
                                                  .Build();
 
             Mocker.GetMock<IBuildFileNames>()
-                  .Setup(s => s.BuildFilePath(It.IsAny<List<Episode>>(), It.IsAny<Series>(), It.IsAny<EpisodeFile>(), It.IsAny<string>(), It.IsAny<NamingConfig>(), It.IsAny<PreferredWordMatchResults>()))
+                  .Setup(s => s.BuildFilePath(It.IsAny<List<Episode>>(), It.IsAny<Series>(), It.IsAny<EpisodeFile>(), It.IsAny<string>(), It.IsAny<NamingConfig>(), It.IsAny<List<CustomFormat>>()))
                   .Returns(@"C:\Test\TV\Series\Season 01\File Name.avi".AsOsAgnostic());
 
             Mocker.GetMock<IBuildFileNames>()
diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFilePreferredWordCalculatorFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFilePreferredWordCalculatorFixture.cs
deleted file mode 100644
index bf6a89bc7..000000000
--- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFilePreferredWordCalculatorFixture.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Profiles.Releases;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.MediaFiles
-{
-    [TestFixture]
-    public class EpisodeFilePreferredWordCalculatorFixture : CoreTest<EpisodeFilePreferredWordCalculator>
-    {
-        private readonly KeyValuePair<string, int> _positiveScore = new KeyValuePair<string, int>("Positive", 10);
-        private readonly KeyValuePair<string, int> _negativeScore = new KeyValuePair<string, int>("Negative", -10);
-        private KeyValuePair<string, int> _neutralScore = new KeyValuePair<string, int>("Neutral", 0);
-        private Series _series;
-        private EpisodeFile _episodeFile;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>.CreateNew().Build();
-            _episodeFile = Builder<EpisodeFile>.CreateNew().Build();
-
-            Mocker.GetMock<IPreferredWordService>()
-                .Setup(s => s.GetMatchingPreferredWordsAndScores(It.IsAny<Series>(), It.IsAny<string>(), 0))
-                .Returns(new List<KeyValuePair<string, int>>());
-        }
-
-        private void GivenPreferredWordScore(string title, params KeyValuePair<string, int>[] matches)
-        {
-            Mocker.GetMock<IPreferredWordService>()
-                  .Setup(s => s.GetMatchingPreferredWordsAndScores(It.IsAny<Series>(), title, 0))
-                  .Returns(matches.ToList());
-        }
-
-        [Test]
-        public void should_return_score_for_relative_file_name_when_it_is_higher_than_scene_name()
-        {
-            GivenPreferredWordScore(_episodeFile.SceneName, _positiveScore);
-            GivenPreferredWordScore(_episodeFile.RelativePath, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(20);
-        }
-
-        [Test]
-        public void should_return_score_for_full_file_name_when_relative_file_name_is_not_available()
-        {
-            _episodeFile.SceneName = null;
-            _episodeFile.RelativePath = null;
-
-            GivenPreferredWordScore(_episodeFile.Path, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(20);
-        }
-
-        [Test]
-        public void should_return_score_for_relative_file_name_when_scene_name_is_null()
-        {
-            _episodeFile.SceneName = null;
-
-            GivenPreferredWordScore(_episodeFile.RelativePath, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(20);
-        }
-
-        [Test]
-        public void should_return_score_for_scene_name_when_higher_than_relative_file_name()
-        {
-            GivenPreferredWordScore(_episodeFile.SceneName, _positiveScore, _positiveScore, _positiveScore);
-            GivenPreferredWordScore(_episodeFile.RelativePath, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(30);
-        }
-
-        [Test]
-        public void should_return_score_for_relative_file_if_available()
-        {
-            GivenPreferredWordScore(_episodeFile.RelativePath, _positiveScore, _positiveScore);
-            GivenPreferredWordScore(_episodeFile.Path, _positiveScore, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(20);
-        }
-
-        [Test]
-        public void should_return_score_for_original_path_folder_name_if_highest()
-        {
-            var folderName = "folder-name";
-            var fileName = "file-name";
-
-            _episodeFile.OriginalFilePath = Path.Combine(folderName, fileName);
-
-            GivenPreferredWordScore(_episodeFile.RelativePath, _positiveScore);
-            GivenPreferredWordScore(_episodeFile.Path, _positiveScore, _positiveScore);
-            GivenPreferredWordScore(folderName, _positiveScore, _positiveScore, _positiveScore);
-            GivenPreferredWordScore(fileName, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(30);
-        }
-
-        [Test]
-        public void should_return_score_for_original_path_file_name_if_highest()
-        {
-            var folderName = "folder-name";
-            var fileName = "file-name";
-
-            _episodeFile.OriginalFilePath = Path.Combine(folderName, fileName);
-
-            GivenPreferredWordScore(_episodeFile.RelativePath, _positiveScore);
-            GivenPreferredWordScore(_episodeFile.Path, _positiveScore, _positiveScore);
-            GivenPreferredWordScore(folderName, _positiveScore, _positiveScore);
-            GivenPreferredWordScore(fileName, _positiveScore, _positiveScore, _positiveScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(30);
-        }
-
-        [Test]
-        public void should_return_negative_score_if_0_result_has_no_matches()
-        {
-            var folderName = "folder-name";
-            var fileName = "file-name";
-
-            _episodeFile.OriginalFilePath = Path.Combine(folderName, fileName);
-
-            GivenPreferredWordScore(_episodeFile.RelativePath, _negativeScore);
-            GivenPreferredWordScore(fileName);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(-10);
-        }
-
-        [Test]
-        public void should_return_0_score_if_0_result_has_matches()
-        {
-            var folderName = "folder-name";
-            var fileName = "file-name";
-
-            _episodeFile.OriginalFilePath = Path.Combine(folderName, fileName);
-
-            GivenPreferredWordScore(_episodeFile.RelativePath, _negativeScore);
-            GivenPreferredWordScore(_episodeFile.Path, _negativeScore);
-            GivenPreferredWordScore(folderName, _negativeScore);
-            GivenPreferredWordScore(fileName, _neutralScore);
-
-            Subject.Calculate(_series, _episodeFile).Should().Be(0);
-        }
-    }
-}
diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs
index 14036d2d3..fbab5bcd5 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs
@@ -1,18 +1,22 @@
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
+using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.CustomFormats;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 
@@ -283,15 +287,24 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         [Test]
         public void should_return_false_if_it_is_a_preferred_word_downgrade_and_equal_language_and_quality()
         {
+            var lowFormat = new List<CustomFormat> { new CustomFormat("Bad Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 2 } };
+
+            CustomFormatsFixture.GivenCustomFormats(lowFormat.First());
+
+            _series.QualityProfile.Value.FormatItems = CustomFormatsFixture.GetSampleFormatItems();
+
             Mocker.GetMock<IConfigService>()
                   .Setup(s => s.DownloadPropersAndRepacks)
                   .Returns(ProperDownloadTypes.DoNotPrefer);
 
-            Mocker.GetMock<IEpisodeFilePreferredWordCalculator>()
-                  .Setup(s => s.Calculate(It.IsAny<Series>(), It.IsAny<EpisodeFile>()))
-                  .Returns(10);
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<ParsedEpisodeInfo>()))
+                  .Returns(lowFormat);
 
-            _localEpisode.PreferredWordScore = 5;
             _localEpisode.Quality = new QualityModel(Quality.Bluray1080p);
 
             _localEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
@@ -318,11 +331,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.DownloadPropersAndRepacks)
                   .Returns(ProperDownloadTypes.DoNotPrefer);
 
-            Mocker.GetMock<IEpisodeFilePreferredWordCalculator>()
-                  .Setup(s => s.Calculate(It.IsAny<Series>(), It.IsAny<EpisodeFile>()))
-                  .Returns(10);
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<ParsedEpisodeInfo>()))
+                  .Returns(new List<CustomFormat>());
 
-            _localEpisode.PreferredWordScore = 5;
             _localEpisode.Quality = new QualityModel(Quality.Bluray2160p);
 
             _localEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
@@ -349,11 +365,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.DownloadPropersAndRepacks)
                   .Returns(ProperDownloadTypes.DoNotPrefer);
 
-            Mocker.GetMock<IEpisodeFilePreferredWordCalculator>()
-                  .Setup(s => s.Calculate(It.IsAny<Series>(), It.IsAny<EpisodeFile>()))
-                  .Returns(10);
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<ParsedEpisodeInfo>()))
+                  .Returns(new List<CustomFormat>());
 
-            _localEpisode.PreferredWordScore = 5;
             _localEpisode.Quality = new QualityModel(Quality.Bluray1080p);
 
             _localEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
@@ -424,11 +443,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.DownloadPropersAndRepacks)
                   .Returns(ProperDownloadTypes.DoNotPrefer);
 
-            Mocker.GetMock<IEpisodeFilePreferredWordCalculator>()
-                  .Setup(s => s.Calculate(It.IsAny<Series>(), It.IsAny<EpisodeFile>()))
-                  .Returns(1);
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<ParsedEpisodeInfo>()))
+                  .Returns(new List<CustomFormat>());
 
-            _localEpisode.PreferredWordScore = 5;
             _localEpisode.Quality = new QualityModel(Quality.Bluray1080p);
 
             _localEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
@@ -454,11 +476,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.DownloadPropersAndRepacks)
                   .Returns(ProperDownloadTypes.DoNotPrefer);
 
-            Mocker.GetMock<IEpisodeFilePreferredWordCalculator>()
-                  .Setup(s => s.Calculate(It.IsAny<Series>(), It.IsAny<EpisodeFile>()))
-                  .Returns(5);
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<EpisodeFile>()))
+                  .Returns(new List<CustomFormat>());
+
+            Mocker.GetMock<ICustomFormatCalculationService>()
+                  .Setup(s => s.ParseCustomFormat(It.IsAny<ParsedEpisodeInfo>()))
+                  .Returns(new List<CustomFormat>());
 
-            _localEpisode.PreferredWordScore = 5;
             _localEpisode.Quality = new QualityModel(Quality.Bluray1080p);
 
             _localEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
index 7d5520ade..91ded3b59 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Qualities;
@@ -45,6 +46,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/CleanTitleYearFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs
index 16ec3d650..8ed607983 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -44,6 +45,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", 2018, "The Mist 2018")]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EpisodeTitleCollapseFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EpisodeTitleCollapseFixture.cs
index 6de46e0e7..e617ed364 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EpisodeTitleCollapseFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EpisodeTitleCollapseFixture.cs
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Qualities;
@@ -61,6 +62,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("Hey, Baby, What's Wrong (1)", "Hey, Baby, What's Wrong (2)", "Hey, Baby, What's Wrong")]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
index 2e504b707..da7936e9f 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
@@ -7,6 +7,7 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.MediaInfo;
 using NzbDrone.Core.Organizer;
@@ -53,6 +54,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/MultiEpisodeFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeFixture.cs
index 896a8cf20..db9b13a02 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -62,6 +63,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/MultiEpisodeTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeTitleFixture.cs
index 503067c10..8b4bb7653 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeTitleFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -54,6 +55,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/OriginalTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/OriginalTitleFixture.cs
index 67d7aeaec..64cee2b5d 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/OriginalTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/OriginalTitleFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -45,6 +46,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>());
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/PreferredWordsFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/PreferredWordsFixture.cs
deleted file mode 100644
index ba41b4edf..000000000
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/PreferredWordsFixture.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Profiles.Releases;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
-{
-    [TestFixture]
-
-    public class PreferredWordsFixture : CoreTest<FileNameBuilder>
-    {
-        private Series _series;
-        private Episode _episode1;
-        private EpisodeFile _episodeFile;
-        private NamingConfig _namingConfig;
-
-        private PreferredWordMatchResults _preferredWords;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>
-                    .CreateNew()
-                    .With(s => s.Title = "South Park")
-                    .Build();
-
-            _namingConfig = NamingConfig.Default;
-            _namingConfig.RenameEpisodes = true;
-
-            Mocker.GetMock<INamingConfigService>()
-                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
-
-            _episode1 = Builder<Episode>.CreateNew()
-                            .With(e => e.Title = "City Sushi")
-                            .With(e => e.SeasonNumber = 15)
-                            .With(e => e.EpisodeNumber = 6)
-                            .With(e => e.AbsoluteEpisodeNumber = 100)
-                            .Build();
-
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
-
-            _preferredWords = new PreferredWordMatchResults()
-            {
-                All = new List<string>()
-                {
-                    "x265",
-                    "extended"
-                },
-                ByReleaseProfile = new Dictionary<string, List<string>>()
-                {
-                    {
-                        "CodecProfile",
-                        new List<string>()
-                        {
-                            "x265"
-                        }
-                    },
-                    {
-                        "EditionProfile",
-                        new List<string>()
-                        {
-                            "extended"
-                        }
-                    }
-                }
-            };
-
-            Mocker.GetMock<IQualityDefinitionService>()
-                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
-                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
-        }
-
-        [TestCase("{Preferred Words}", "x265 extended")]
-        [TestCase("{Preferred Words:CodecProfile}", "x265")]
-        [TestCase("{Preferred Words:EditionProfile}", "extended")]
-        [TestCase("{Preferred Words:CodecProfile} - {PreferredWords:EditionProfile}", "x265 - extended")]
-        public void should_replace_PreferredWords(string format, string expected)
-        {
-            _namingConfig.StandardEpisodeFormat = format;
-
-            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, preferredWords: _preferredWords)
-                   .Should().Be(expected);
-        }
-
-        [TestCase("{Preferred Words:}", "{Preferred Words:}")]
-        public void should_not_replace_PreferredWords(string format, string expected)
-        {
-            _namingConfig.StandardEpisodeFormat = format;
-
-            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, preferredWords: _preferredWords)
-                   .Should().Be(expected);
-        }
-
-        [TestCase("{Preferred Words:NonexistentProfile}", "")]
-        public void should_replace_PreferredWords_with_empty_string(string format, string expected)
-        {
-            _namingConfig.StandardEpisodeFormat = format;
-
-            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, preferredWords: _preferredWords)
-                   .Should().Be(expected);
-        }
-    }
-}
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixure.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixure.cs
index 674e7da09..eb9d5998e 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixure.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixure.cs
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Qualities;
@@ -45,6 +46,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>());
         }
 
 //        { "\\", "/", "<", ">", "?", "*", ":", "|", "\"" };
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs
index 2d8176d8b..1cf61bc98 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs
@@ -7,6 +7,7 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.MediaInfo;
 using NzbDrone.Core.Organizer;
@@ -52,6 +53,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("Con Game", "Con_Game")]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
index 8d19911bd..b24810b30 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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -44,6 +45,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/OrganizerTests/FileNameBuilderTests/TitleTheYearFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheYearFixture.cs
index 0e11f2f56..51bf379b6 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheYearFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheYearFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -44,6 +45,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", 2018, "Mist, The (2018)")]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleYearFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleYearFixture.cs
index 55530632a..afdad33ea 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleYearFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleYearFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -44,6 +45,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", 2018, "The Mist (2018)")]
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TruncatedEpisodeTitlesFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TruncatedEpisodeTitlesFixture.cs
index 74bc4ba73..aa1450a36 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TruncatedEpisodeTitlesFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TruncatedEpisodeTitlesFixture.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.Organizer;
 using NzbDrone.Core.Qualities;
@@ -84,6 +85,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/Profiles/QualityProfileServiceFixture.cs b/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs
index 4b8e4934e..f04b45a9c 100644
--- a/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs
@@ -3,6 +3,7 @@ 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.Profiles.Qualities;
@@ -25,6 +26,10 @@ namespace NzbDrone.Core.Test.Profiles
         [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 fa9fdfb47..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.Profiles.Releases;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.Profiles.Releases.PreferredWordService
-{
-    [TestFixture]
-    public class CalculateFixture : CoreTest<Core.Profiles.Releases.PreferredWordService>
-    {
-        private Series _series = null;
-        private List<ReleaseProfile> _releaseProfiles = null;
-        private string _title = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>.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>("x264", 5),
-                                                     new KeyValuePair<string, int>("x265", -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(_series, _title, 0).Should().Be(0);
-        }
-
-        [Test]
-        public void should_return_0_when_there_are_no_matching_preferred_words()
-        {
-            GivenMatchingTerms();
-
-            Subject.Calculate(_series, _title, 0).Should().Be(0);
-        }
-
-        [Test]
-        public void should_calculate_positive_score()
-        {
-            GivenMatchingTerms("x264");
-
-            Subject.Calculate(_series, _title, 0).Should().Be(5);
-        }
-
-        [Test]
-        public void should_calculate_negative_score()
-        {
-            GivenMatchingTerms("x265");
-
-            Subject.Calculate(_series, _title, 0).Should().Be(-10);
-        }
-
-        [Test]
-        public void should_calculate_using_multiple_profiles()
-        {
-            _releaseProfiles.Add(_releaseProfiles.First());
-
-            GivenMatchingTerms("x264");
-
-            Subject.Calculate(_series, _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 cef2758b2..000000000
--- a/src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Profiles.Releases;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.Profiles.Releases.PreferredWordService
-{
-    [TestFixture]
-    public class GetMatchingPreferredWordsFixture : CoreTest<Core.Profiles.Releases.PreferredWordService>
-    {
-        private Series _series = null;
-        private List<ReleaseProfile> _releaseProfiles = null;
-        private List<ReleaseProfile> _namedReleaseProfiles = null;
-        private string _title = "Series.Title.S01E01.extended.720p.HDTV.x264-Sonarr";
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>.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>("x264", 5),
-                                                     new KeyValuePair<string, int>("x265", -10)
-                                                 }
-                                 });
-
-            _namedReleaseProfiles = new List<ReleaseProfile>();
-
-            _namedReleaseProfiles.Add(new ReleaseProfile
-            {
-                Name = "CodecProfile",
-                Preferred = new List<KeyValuePair<string, int>>
-                                                 {
-                                                     new KeyValuePair<string, int>("x264", 5),
-                                                     new KeyValuePair<string, int>("x265", -10)
-                                                 }
-            });
-            _namedReleaseProfiles.Add(new ReleaseProfile
-            {
-                Name = "EditionProfile",
-                Preferred = new List<KeyValuePair<string, int>>
-                                                 {
-                                                     new KeyValuePair<string, int>("extended", 5),
-                                                     new KeyValuePair<string, int>("uncut", -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);
-        }
-
-        private void GivenNamedReleaseProfile()
-        {
-            Mocker.GetMock<IReleaseProfileService>()
-                  .Setup(s => s.EnabledForTags(It.IsAny<HashSet<int>>(), It.IsAny<int>()))
-                  .Returns(_namedReleaseProfiles);
-        }
-
-        [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>());
-
-            var matchingResults = Subject.GetMatchingPreferredWords(_series, _title);
-            matchingResults.All.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_empty_list_when_there_are_no_matching_preferred_words_from_unnamedprofile()
-        {
-            _releaseProfiles.First().Preferred.RemoveAt(0);
-            GivenReleaseProfile();
-
-            var matchingResults = Subject.GetMatchingPreferredWords(_series, _title);
-            matchingResults.All.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_list_of_matching_terms_from_unnamedprofile()
-        {
-            GivenReleaseProfile();
-
-            var matchingResults = Subject.GetMatchingPreferredWords(_series, _title);
-            matchingResults.All.Should().Equal(new[] { "x264" });
-        }
-
-        [Test]
-        public void should_return_empty_list_when_there_are_no_matching_preferred_words_from_namedprofiles()
-        {
-            _namedReleaseProfiles.First().Preferred.RemoveAt(0);
-            _namedReleaseProfiles.Skip(1).First().Preferred.RemoveAt(0);
-
-            GivenNamedReleaseProfile();
-
-            var matchingResults = Subject.GetMatchingPreferredWords(_series, _title);
-            matchingResults.All.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_list_of_matching_terms_from_multiple_namedprofiles()
-        {
-            GivenNamedReleaseProfile();
-
-            var matchingResults = Subject.GetMatchingPreferredWords(_series, _title);
-            matchingResults.ByReleaseProfile.Should().ContainKey("CodecProfile").WhichValue.Should().Equal(new[] { "x264" });
-            matchingResults.ByReleaseProfile.Should().ContainKey("EditionProfile").WhichValue.Should().Equal(new[] { "extended" });
-        }
-
-        [Test]
-        public void should_return_list_of_matching_terms_from_multiple_namedprofiles_all()
-        {
-            GivenNamedReleaseProfile();
-
-            var matchingResults = Subject.GetMatchingPreferredWords(_series, _title);
-            matchingResults.All.Should().Equal(new[] { "x264", "extended" });
-        }
-    }
-}
diff --git a/src/Sonarr.Http/ClientSchema/SelectOption.cs b/src/NzbDrone.Core/Annotations/SelectOption.cs
similarity index 84%
rename from src/Sonarr.Http/ClientSchema/SelectOption.cs
rename to src/NzbDrone.Core/Annotations/SelectOption.cs
index 130453095..feef0c342 100644
--- a/src/Sonarr.Http/ClientSchema/SelectOption.cs
+++ b/src/NzbDrone.Core/Annotations/SelectOption.cs
@@ -1,4 +1,4 @@
-namespace Sonarr.Http.ClientSchema
+namespace NzbDrone.Core.Annotations
 {
     public class SelectOption
     {
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..5fb0aaf5b
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
@@ -0,0 +1,148 @@
+using System;
+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.Parser;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public interface ICustomFormatCalculationService
+    {
+        List<CustomFormat> ParseCustomFormat(ParsedEpisodeInfo movieInfo);
+        List<CustomFormat> ParseCustomFormat(EpisodeFile movieFile);
+        List<CustomFormat> ParseCustomFormat(Blocklist blocklist);
+        List<CustomFormat> ParseCustomFormat(EpisodeHistory history);
+    }
+
+    public class CustomFormatCalculationService : ICustomFormatCalculationService
+    {
+        private readonly ICustomFormatService _formatService;
+        private readonly IParsingService _parsingService;
+        private readonly ISeriesService _seriesService;
+
+        public CustomFormatCalculationService(ICustomFormatService formatService,
+                                              IParsingService parsingService,
+                                              ISeriesService seriesService)
+        {
+            _formatService = formatService;
+            _parsingService = parsingService;
+            _seriesService = seriesService;
+        }
+
+        public static List<CustomFormat> ParseCustomFormat(ParsedEpisodeInfo episodeInfo, 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(episodeInfo))
+                    })
+                    .ToList();
+
+                if (specificationMatches.All(x => x.DidMatch))
+                {
+                    matches.Add(customFormat);
+                }
+            }
+
+            return matches;
+        }
+
+        public static List<CustomFormat> ParseCustomFormat(EpisodeFile episodeFile, List<CustomFormat> allCustomFormats)
+        {
+            var sceneName = string.Empty;
+            if (episodeFile.SceneName.IsNotNullOrWhiteSpace())
+            {
+                sceneName = episodeFile.SceneName;
+            }
+            else if (episodeFile.OriginalFilePath.IsNotNullOrWhiteSpace())
+            {
+                sceneName = episodeFile.OriginalFilePath;
+            }
+            else if (episodeFile.RelativePath.IsNotNullOrWhiteSpace())
+            {
+                sceneName = Path.GetFileName(episodeFile.RelativePath);
+            }
+
+            var info = new ParsedEpisodeInfo
+            {
+                SeriesTitle = episodeFile.Series.Value.Title,
+                ReleaseTitle  = sceneName,
+                Quality = episodeFile.Quality,
+                Language = episodeFile.Language,
+                ReleaseGroup = episodeFile.ReleaseGroup,
+                ExtraInfo = new Dictionary<string, object>
+                {
+                    { "Size", episodeFile.Size },
+                    { "Filename", Path.GetFileName(episodeFile.RelativePath) }
+                }
+            };
+
+            return ParseCustomFormat(info, allCustomFormats);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(ParsedEpisodeInfo movieInfo)
+        {
+            return ParseCustomFormat(movieInfo, _formatService.All());
+        }
+
+        public List<CustomFormat> ParseCustomFormat(EpisodeFile wpisodeFile)
+        {
+            return ParseCustomFormat(wpisodeFile, _formatService.All());
+        }
+
+        public List<CustomFormat> ParseCustomFormat(Blocklist blocklist)
+        {
+            var movie = _seriesService.GetSeries(blocklist.SeriesId);
+            var parsed = Parser.Parser.ParseTitle(blocklist.SourceTitle);
+
+            var info = new ParsedEpisodeInfo
+            {
+                SeriesTitle = movie.Title,
+                ReleaseTitle = parsed?.ReleaseTitle ?? blocklist.SourceTitle,
+                Quality = blocklist.Quality,
+                Language = blocklist.Language,
+                ReleaseGroup = parsed?.ReleaseGroup,
+                ExtraInfo = new Dictionary<string, object>
+                {
+                    { "Size", blocklist.Size }
+                }
+            };
+
+            return ParseCustomFormat(info);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(EpisodeHistory history)
+        {
+            var movie = _seriesService.GetSeries(history.SeriesId);
+            var parsed = Parser.Parser.ParseTitle(history.SourceTitle);
+
+            long.TryParse(history.Data.GetValueOrDefault("size"), out var size);
+
+            var info = new ParsedEpisodeInfo
+            {
+                SeriesTitle = movie.Title,
+                ReleaseTitle = parsed?.ReleaseTitle ?? history.SourceTitle,
+                Quality = history.Quality,
+                Language = history.Language,
+                ReleaseGroup = parsed?.ReleaseGroup,
+                ExtraInfo = new Dictionary<string, object>
+                {
+                    { "Size", size }
+                }
+            };
+
+            return ParseCustomFormat(info);
+        }
+    }
+}
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..203b4dd4f
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs
@@ -0,0 +1,34 @@
+using NzbDrone.Core.Parser.Model;
+
+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 bool IsSatisfiedBy(ParsedEpisodeInfo episodeInfo)
+        {
+            var match = IsSatisfiedByWithoutNegate(episodeInfo);
+            if (Negate)
+            {
+                match = !match;
+            }
+
+            return match;
+        }
+
+        protected abstract bool IsSatisfiedByWithoutNegate(ParsedEpisodeInfo episodeInfo);
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
new file mode 100644
index 000000000..2e7263cf1
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
@@ -0,0 +1,17 @@
+using NzbDrone.Core.Parser.Model;
+
+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; }
+
+        ICustomFormatSpecification Clone();
+        bool IsSatisfiedBy(ParsedEpisodeInfo episodeInfo);
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs b/src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs
new file mode 100644
index 000000000..030dff60a
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs
@@ -0,0 +1,32 @@
+using System.Text.RegularExpressions;
+using NzbDrone.Core.Annotations;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public abstract class RegexSpecificationBase : CustomFormatSpecificationBase
+    {
+        protected Regex _regex;
+        protected string _raw;
+
+        [FieldDefinition(1, Label = "Regular Expression")]
+        public string Value
+        {
+            get => _raw;
+            set
+            {
+                _raw = value;
+                _regex = new Regex(value, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            }
+        }
+
+        protected bool MatchString(string compared)
+        {
+            if (compared == null || _regex == null)
+            {
+                return false;
+            }
+
+            return _regex.IsMatch(compared);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs
new file mode 100644
index 000000000..3c0066a43
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseGroupSpecification.cs
@@ -0,0 +1,16 @@
+using NzbDrone.Core.Parser.Model;
+
+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(ParsedEpisodeInfo episodeInfo)
+        {
+            return MatchString(episodeInfo?.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..c7f00baca
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Parser.Model;
+
+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(ParsedEpisodeInfo episodeInfo)
+        {
+            var filename = (string)episodeInfo?.ExtraInfo?.GetValueOrDefault("Filename");
+
+            return MatchString(episodeInfo?.ReleaseTitle) || MatchString(filename);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ResolutionSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ResolutionSpecification.cs
new file mode 100644
index 000000000..b45e6a07a
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ResolutionSpecification.cs
@@ -0,0 +1,20 @@
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class ResolutionSpecification : CustomFormatSpecificationBase
+    {
+        public override int Order => 6;
+        public override string ImplementationName => "Resolution";
+
+        [FieldDefinition(1, Label = "Resolution", Type = FieldType.Select, SelectOptions = typeof(Resolution))]
+        public int Value { get; set; }
+
+        protected override bool IsSatisfiedByWithoutNegate(ParsedEpisodeInfo episodeInfo)
+        {
+            return (episodeInfo?.Quality?.Quality?.Resolution ?? (int)Resolution.Unknown) == Value;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
new file mode 100644
index 000000000..bb2d82553
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class SizeSpecification : CustomFormatSpecificationBase
+    {
+        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(ParsedEpisodeInfo episodeInfo)
+        {
+            var size = (episodeInfo?.ExtraInfo?.GetValueOrDefault("Size", 0.0) as long?) ?? 0;
+
+            return size > Min.Gigabytes() && size <= Max.Gigabytes();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/SourceSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/SourceSpecification.cs
new file mode 100644
index 000000000..368ba0390
--- /dev/null
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/SourceSpecification.cs
@@ -0,0 +1,20 @@
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Qualities;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class SourceSpecification : CustomFormatSpecificationBase
+    {
+        public override int Order => 5;
+        public override string ImplementationName => "Source";
+
+        [FieldDefinition(1, Label = "Source", Type = FieldType.Select, SelectOptions = typeof(QualitySource))]
+        public int Value { get; set; }
+
+        protected override bool IsSatisfiedByWithoutNegate(ParsedEpisodeInfo episodeInfo)
+        {
+            return (episodeInfo?.Quality?.Quality?.Source ?? (int)QualitySource.Unknown) == (QualitySource)Value;
+        }
+    }
+}
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..fc3549159
--- /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}, Sonarr.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/171_add_custom_formats.cs b/src/NzbDrone.Core/Datastore/Migration/171_add_custom_formats.cs
new file mode 100644
index 000000000..6bd6d4fee
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/171_add_custom_formats.cs
@@ -0,0 +1,266 @@
+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(171)]
+    public class add_custom_formats : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            //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 == '[]'");
+
+            //TODO: Kill any references to Preferred in History and Files
+            //Data.PreferredWordScore
+        }
+
+        private void MigratePreferredTerms(IDbConnection conn, IDbTransaction tran)
+        {
+            var updatedCollections = new List<CustomFormat171>();
+
+            // Pull list of quality Profiles
+            var qualityProfiles = new List<QualityProfile171>();
+            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 QualityProfile171
+                        {
+                            Id = id,
+                        });
+                    }
+                }
+            }
+
+            //Generate List of Custom Formats from Preferred Words
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.Transaction = tran;
+                cmd.CommandText = "SELECT Preferred, Name, IncludePreferredWhenRenaming, Enabled, Id FROM ReleaseProfiles WHERE Preferred IS NOT NULL";
+
+                using (var reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        var preferred = reader.GetString(0);
+                        var nameObj = reader.GetValue(1);
+                        var includeName = reader.GetBoolean(2);
+                        var enabled = reader.GetBoolean(3);
+                        var releaseProfileId = reader.GetInt32(4);
+
+                        var name = nameObj == DBNull.Value ? null : (string)nameObj;
+
+                        if (name.IsNullOrWhiteSpace())
+                        {
+                            name = $"Unnamed_{releaseProfileId}";
+                        }
+                        else
+                        {
+                            name = $"{name}_{releaseProfileId}";
+                        }
+
+                        var data = STJson.Deserialize<List<PreferredWord170>>(preferred);
+
+                        var specs = new List<CustomFormatSpec171>();
+
+                        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 CustomFormat171
+                            {
+                                Name = data.Count > 1 ? $"{name}_{nameIdentifier++}" : name,
+                                PreferredName = name,
+                                IncludeCustomFormatWhenRenaming = includeName,
+                                Score = term.Value,
+                                Enabled = enabled,
+                                Specifications = new List<CustomFormatSpec171>
+                                {
+                                    new CustomFormatSpec171
+                                    {
+                                        Type = "ReleaseTitleSpecification",
+                                        Body = new CustomFormatReleaseTitleSpec171
+                                        {
+                                            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<CustomFormat171>();
+            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 CustomFormat171
+                        {
+                            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)
+        {
+            using (IDbCommand namingConfigCmd = conn.CreateCommand())
+            {
+                namingConfigCmd.Transaction = tran;
+                namingConfigCmd.CommandText = @"SELECT * FROM NamingConfig LIMIT 1";
+                using (IDataReader namingConfigReader = namingConfigCmd.ExecuteReader())
+                {
+                    var standardEpisodeFormatIndex = namingConfigReader.GetOrdinal("StandardEpisodeFormat");
+                    var dailyEpisodeFormatIndex = namingConfigReader.GetOrdinal("DailyEpisodeFormat");
+                    var animeEpisodeFormatIndex = namingConfigReader.GetOrdinal("AnimeEpisodeFormat");
+
+                    while (namingConfigReader.Read())
+                    {
+                        var standardEpisodeFormat = NameReplace(namingConfigReader.GetString(standardEpisodeFormatIndex));
+                        var dailyEpisodeFormat = NameReplace(namingConfigReader.GetString(dailyEpisodeFormatIndex));
+                        var animeEpisodeFormat = NameReplace(namingConfigReader.GetString(animeEpisodeFormatIndex));
+
+                        using (IDbCommand updateCmd = conn.CreateCommand())
+                        {
+                            var text = string.Format("UPDATE NamingConfig " +
+                                                     "SET StandardEpisodeFormat = '{0}', " +
+                                                     "DailyEpisodeFormat = '{1}', " +
+                                                     "AnimeEpisodeFormat = '{2}'",
+                                                     standardEpisodeFormat,
+                                                     dailyEpisodeFormat,
+                                                     animeEpisodeFormat);
+
+                            updateCmd.Transaction = tran;
+                            updateCmd.CommandText = text;
+                            updateCmd.ExecuteNonQuery();
+                        }
+                    }
+                }
+            }
+        }
+
+        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 PreferredWord170
+        {
+            public string Key { get; set; }
+            public int Value { get; set; }
+        }
+
+        private class QualityProfile171
+        {
+            public int Id { get; set; }
+            public string FormatItems { get; set; }
+        }
+
+        private class CustomFormat171
+        {
+            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 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/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index a5995a6d9..b5997fcd3 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.DataAugmentation.Scene;
 using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Download;
@@ -28,6 +29,7 @@ using NzbDrone.Core.Messaging.Commands;
 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.Languages;
 using NzbDrone.Core.Profiles.Qualities;
@@ -127,6 +129,8 @@ namespace NzbDrone.Core.Datastore
                   .Ignore(d => d.GroupName)
                   .Ignore(d => d.Weight);
 
+            Mapper.Entity<CustomFormat>("CustomFormats").RegisterModel();
+
             Mapper.Entity<QualityProfile>("QualityProfiles").RegisterModel();
             Mapper.Entity<LanguageProfile>("LanguageProfiles").RegisterModel();
             Mapper.Entity<Log>("Logs").RegisterModel();
@@ -169,7 +173,9 @@ namespace NzbDrone.Core.Datastore
             SqlMapper.AddTypeHandler(new DapperUtcConverter());
             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<LanguageProfileItem>>(new LanguageIntConverter()));
+            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 86ae5a738..b2cdca37a 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.DecisionEngine
             {
                 CompareQuality,
                 CompareLanguage,
-                ComparePreferredWordScore,
+                CompareCustomFormatScore,
                 CompareProtocol,
                 CompareEpisodeCount,
                 CompareEpisodeNumber,
@@ -85,9 +85,9 @@ namespace NzbDrone.Core.DecisionEngine
             return CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode => remoteEpisode.Series.LanguageProfile.Value.Languages.FindIndex(l => l.Language == remoteEpisode.ParsedEpisodeInfo.Language));
         }
 
-        private int ComparePreferredWordScore(DownloadDecision x, DownloadDecision y)
+        private int CompareCustomFormatScore(DownloadDecision x, DownloadDecision y)
         {
-            return CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode => remoteEpisode.PreferredWordScore);
+            return CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteMovie => remoteMovie.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 532b157e1..77c2323e5 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.DataAugmentation.Scene;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Download.Aggregation;
@@ -24,18 +25,21 @@ namespace NzbDrone.Core.DecisionEngine
     {
         private readonly IEnumerable<IDecisionEngineSpecification> _specifications;
         private readonly IParsingService _parsingService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly IRemoteEpisodeAggregationService _aggregationService;
         private readonly ISceneMappingService _sceneMappingService;
         private readonly Logger _logger;
 
         public DownloadDecisionMaker(IEnumerable<IDecisionEngineSpecification> specifications,
                                      IParsingService parsingService,
+                                     ICustomFormatCalculationService formatService,
                                      IRemoteEpisodeAggregationService aggregationService,
                                      ISceneMappingService sceneMappingService,
                                      Logger logger)
         {
             _specifications = specifications;
             _parsingService = parsingService;
+            _formatCalculator = formatService;
             _aggregationService = aggregationService;
             _sceneMappingService = sceneMappingService;
             _logger = logger;
@@ -89,6 +93,9 @@ namespace NzbDrone.Core.DecisionEngine
                         var remoteEpisode = _parsingService.Map(parsedEpisodeInfo, report.TvdbId, report.TvRageId, searchCriteria);
                         remoteEpisode.Release = report;
 
+                        remoteEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(parsedEpisodeInfo);
+                        remoteEpisode.CustomFormatScore = remoteEpisode?.Series?.QualityProfile?.Value.CalculateCustomFormatScore(remoteEpisode.CustomFormats) ?? 0;
+
                         if (remoteEpisode.Series == null)
                         {
                             var reason = "Unknown Series";
@@ -129,7 +136,7 @@ namespace NzbDrone.Core.DecisionEngine
                             var remoteEpisode = new RemoteEpisode
                             {
                                 Release = report,
-                                ParsedEpisodeInfo = parsedEpisodeInfo
+                                ParsedEpisodeInfo = parsedEpisodeInfo,
                             };
 
                             decision = new DownloadDecision(remoteEpisode, new Rejection("Unable to parse release"));
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CustomFormatAllowedByProfileSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CustomFormatAllowedByProfileSpecification.cs
new file mode 100644
index 000000000..a047abb3f
--- /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(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
+        {
+            var minScore = subject.Series.QualityProfile.Value.MinFormatScore;
+            var score = subject.CustomFormatScore;
+
+            if (score < minScore)
+            {
+                return Decision.Reject("Custom Formats {0} have score {1} below Series 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 07305d9be..95f17538c 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
@@ -10,13 +11,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
     public class CutoffSpecification : IDecisionEngineSpecification
     {
         private readonly UpgradableSpecification _upgradableSpecification;
-        private readonly IEpisodeFilePreferredWordCalculator _episodeFilePreferredWordCalculator;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly Logger _logger;
 
-        public CutoffSpecification(UpgradableSpecification upgradableSpecification, IEpisodeFilePreferredWordCalculator episodeFilePreferredWordCalculator, Logger logger)
+        public CutoffSpecification(UpgradableSpecification upgradableSpecification, ICustomFormatCalculationService formatService, Logger logger)
         {
             _upgradableSpecification = upgradableSpecification;
-            _episodeFilePreferredWordCalculator = episodeFilePreferredWordCalculator;
+            _formatService = formatService;
             _logger = logger;
         }
 
@@ -38,13 +39,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
                 _logger.Debug("Comparing file quality and language with report. Existing file is {0} - {1}", file.Quality, file.Language);
 
+                var customFormats = _formatService.ParseCustomFormat(file);
+
                 if (!_upgradableSpecification.CutoffNotMet(qualityProfile,
                                                            languageProfile,
                                                            file.Quality,
                                                            file.Language,
-                                                           _episodeFilePreferredWordCalculator.Calculate(subject.Series, file),
-                                                           subject.ParsedEpisodeInfo.Quality,
-                                                           subject.PreferredWordScore))
+                                                           _formatService.ParseCustomFormat(file),
+                                                           subject.ParsedEpisodeInfo.Quality))
                 {
                     _logger.Debug("Cutoff already met, rejecting.");
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
index 7be492c56..4da8791ff 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
@@ -12,17 +13,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,
+                                  ICustomFormatCalculationService formatService,
                                   Logger logger)
         {
             _queueService = queueService;
             _upgradableSpecification = upgradableSpecification;
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
+            _formatService = formatService;
             _logger = logger;
         }
 
@@ -52,16 +53,16 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                     continue;
                 }
 
+                var queuedItemCustomFormats = _formatService.ParseCustomFormat(remoteEpisode.ParsedEpisodeInfo);
+
                 _logger.Debug("Checking if existing release in queue meets cutoff. Queued: {0} - {1}", remoteEpisode.ParsedEpisodeInfo.Quality, remoteEpisode.ParsedEpisodeInfo.Language);
-                var queuedItemPreferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Series, queueItem.Title, subject.Release?.IndexerId ?? 0);
 
                 if (!_upgradableSpecification.CutoffNotMet(qualityProfile,
                     languageProfile,
                     remoteEpisode.ParsedEpisodeInfo.Quality,
                     remoteEpisode.ParsedEpisodeInfo.Language,
-                    queuedItemPreferredWordScore,
-                    subject.ParsedEpisodeInfo.Quality,
-                    subject.PreferredWordScore))
+                    queuedItemCustomFormats,
+                    subject.ParsedEpisodeInfo.Quality))
                 {
                     return Decision.Reject("Release in queue already meets cutoff: {0} - {1}", remoteEpisode.ParsedEpisodeInfo.Quality, remoteEpisode.ParsedEpisodeInfo.Language);
                 }
@@ -72,10 +73,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                                                            languageProfile,
                                                            remoteEpisode.ParsedEpisodeInfo.Quality,
                                                            remoteEpisode.ParsedEpisodeInfo.Language,
-                                                           queuedItemPreferredWordScore,
+                                                           remoteEpisode.CustomFormats,
                                                            subject.ParsedEpisodeInfo.Quality,
                                                            subject.ParsedEpisodeInfo.Language,
-                                                           subject.PreferredWordScore))
+                                                           subject.CustomFormats))
                 {
                     return Decision.Reject("Release in queue is of equal or higher preference: {0} - {1}", remoteEpisode.ParsedEpisodeInfo.Quality, remoteEpisode.ParsedEpisodeInfo.Language);
                 }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
index a8e186ff9..217a0dc2e 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
@@ -2,6 +2,7 @@ using System;
 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;
@@ -13,20 +14,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 upgradableSpecification,
-                                           IConfigService configService,
-                                           IPreferredWordService preferredWordServiceCalculator,
-                                           Logger logger)
+                                    UpgradableSpecification upgradableSpecification,
+                                    ICustomFormatCalculationService formatService,
+                                    IConfigService configService,
+                                    Logger logger)
         {
             _historyService = historyService;
             _upgradableSpecification = upgradableSpecification;
+            _formatService = formatService;
             _configService = configService;
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
             _logger = logger;
         }
 
@@ -58,28 +59,27 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                         continue;
                     }
 
+                    var customFormats = _formatService.ParseCustomFormat(mostRecent);
+
                     // 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 preferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Series, mostRecent.SourceTitle, subject.Release?.IndexerId ?? 0);
-
                     var cutoffUnmet = _upgradableSpecification.CutoffNotMet(
                         subject.Series.QualityProfile,
                         subject.Series.LanguageProfile,
                         mostRecent.Quality,
                         mostRecent.Language,
-                        preferredWordScore,
-                        subject.ParsedEpisodeInfo.Quality,
-                        subject.PreferredWordScore);
+                        customFormats,
+                        subject.ParsedEpisodeInfo.Quality);
 
                     var upgradeable = _upgradableSpecification.IsUpgradable(
                         subject.Series.QualityProfile,
                         subject.Series.LanguageProfile,
                         mostRecent.Quality,
                         mostRecent.Language,
-                        preferredWordScore,
+                        customFormats,
                         subject.ParsedEpisodeInfo.Quality,
                         subject.ParsedEpisodeInfo.Language,
-                        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 03917818f..f080ffdc0 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
@@ -1,5 +1,8 @@
+using System.Collections.Generic;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
@@ -9,10 +12,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 {
     public interface IUpgradableSpecification
     {
-        bool IsUpgradable(QualityProfile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, int currentScore, QualityModel newQuality, Language newLanguage, int newScore);
+        bool IsUpgradable(QualityProfile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, List<CustomFormat> currentCustomFormats, QualityModel newQuality, Language newLanguage, List<CustomFormat> newCustomFormats);
         bool QualityCutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null);
         bool LanguageCutoffNotMet(LanguageProfile languageProfile, Language currentLanguage);
-        bool CutoffNotMet(QualityProfile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, int currentScore, QualityModel newQuality = null, int newScore = 0);
+        bool CutoffNotMet(QualityProfile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, List<CustomFormat> currentCustomFormats, QualityModel newQuality = null);
         bool IsRevisionUpgrade(QualityModel currentQuality, QualityModel newQuality);
         bool IsUpgradeAllowed(QualityProfile qualityProfile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, QualityModel newQuality, Language newLanguage);
     }
@@ -35,7 +38,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             return newScore > currentScore;
         }
 
-        public bool IsUpgradable(QualityProfile qualityProfile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, int currentScore, QualityModel newQuality, Language newLanguage, int newScore)
+        public bool IsUpgradable(QualityProfile qualityProfile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, List<CustomFormat> currentCustomFormats, QualityModel newQuality, Language newLanguage, List<CustomFormat> newCustomFormats)
         {
             var qualityComparer = new QualityModelComparer(qualityProfile);
             var qualityCompare = qualityComparer.Compare(newQuality?.Quality, currentQuality.Quality);
@@ -64,6 +67,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 return true;
             }
 
+            var currentFormatScore = qualityProfile.CalculateCustomFormatScore(currentCustomFormats);
+            var newFormatScore = qualityProfile.CalculateCustomFormatScore(newCustomFormats);
+
             // Reject unless the user does not prefer propers/repacks and it's a revision downgrade.
             if (downloadPropersAndRepacks != ProperDownloadTypes.DoNotPrefer &&
                 qualityRevisionComapre < 0)
@@ -86,13 +92,15 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 return false;
             }
 
-            if (!IsPreferredWordUpgradable(currentScore, newScore))
+            if (newFormatScore <= currentFormatScore)
             {
-                _logger.Debug("Existing item has an equal or 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;
         }
 
@@ -125,7 +133,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             return languageCompare < 0;
         }
 
-        public bool CutoffNotMet(QualityProfile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, 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, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, List<CustomFormat> currentFormats, QualityModel newQuality = null)
         {
             // If we can upgrade the language (it is not the cutoff) then the quality doesn't
             // matter as we can always get same quality with prefered language.
@@ -139,7 +153,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 return true;
             }
 
-            if (IsPreferredWordUpgradable(currentScore, newScore))
+            if (CustomFormatCutoffNotMet(profile, currentFormats))
             {
                 return true;
             }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
index 35ee34ae7..5918192e4 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
@@ -10,13 +11,15 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
     public class UpgradeDiskSpecification : IDecisionEngineSpecification
     {
         private readonly UpgradableSpecification _upgradableSpecification;
-        private readonly IEpisodeFilePreferredWordCalculator _episodeFilePreferredWordCalculator;
+        private readonly ICustomFormatCalculationService _formatService;
         private readonly Logger _logger;
 
-        public UpgradeDiskSpecification(UpgradableSpecification upgradableSpecification, IEpisodeFilePreferredWordCalculator episodeFilePreferredWordCalculator, Logger logger)
+        public UpgradeDiskSpecification(UpgradableSpecification upgradableSpecification,
+                                        ICustomFormatCalculationService formatService,
+                                        Logger logger)
         {
             _upgradableSpecification = upgradableSpecification;
-            _episodeFilePreferredWordCalculator = episodeFilePreferredWordCalculator;
+            _formatService = formatService;
             _logger = logger;
         }
 
@@ -33,16 +36,18 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                     continue;
                 }
 
+                var customFormats = _formatService.ParseCustomFormat(file);
+
                 _logger.Debug("Comparing file quality and language with report. Existing file is {0} - {1}", file.Quality, file.Language);
 
                 if (!_upgradableSpecification.IsUpgradable(subject.Series.QualityProfile,
                                                            subject.Series.LanguageProfile,
                                                            file.Quality,
                                                            file.Language,
-                                                           _episodeFilePreferredWordCalculator.Calculate(subject.Series, file),
+                                                           customFormats,
                                                            subject.ParsedEpisodeInfo.Quality,
                                                            subject.ParsedEpisodeInfo.Language,
-                                                           subject.PreferredWordScore))
+                                                           subject.CustomFormats))
                 {
                     return Decision.Reject("Existing file on disk is of equal or higher preference: {0} - {1}", file.Quality, file.Language);
                 }
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 5d0a58dd1..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 : IAggregateRemoteEpisode
-    {
-        private readonly IPreferredWordService _preferredWordServiceCalculator;
-
-        public AggregatePreferredWordScore(IPreferredWordService preferredWordServiceCalculator)
-        {
-            _preferredWordServiceCalculator = preferredWordServiceCalculator;
-        }
-
-        public RemoteEpisode Aggregate(RemoteEpisode remoteEpisode)
-        {
-            remoteEpisode.PreferredWordScore = _preferredWordServiceCalculator.Calculate(remoteEpisode.Series, remoteEpisode.Release.Title, remoteEpisode.Release.IndexerId);
-
-            return remoteEpisode;
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
index 43b786152..44b49ade4 100644
--- a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
+++ b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
@@ -117,7 +117,7 @@ namespace NzbDrone.Core.Download.History
             history.Data.Add("Indexer", message.Episode.Release.Indexer);
             history.Data.Add("DownloadClient", message.DownloadClient);
             history.Data.Add("DownloadClientName", message.DownloadClientName);
-            history.Data.Add("PreferredWordScore", message.Episode.PreferredWordScore.ToString());
+            history.Data.Add("CustomFormatScore", message.Episode.CustomFormatScore.ToString());
 
             _repository.Insert(history);
         }
diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
index 0c3370d11..d604a7958 100644
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Download.History;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Messaging.Events;
@@ -30,18 +31,21 @@ namespace NzbDrone.Core.Download.TrackedDownloads
         private readonly IHistoryService _historyService;
         private readonly IEventAggregator _eventAggregator;
         private readonly IDownloadHistoryService _downloadHistoryService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly Logger _logger;
         private readonly ICached<TrackedDownload> _cache;
 
         public TrackedDownloadService(IParsingService parsingService,
                                       ICacheManager cacheManager,
                                       IHistoryService historyService,
+                                      ICustomFormatCalculationService formatCalculator,
                                       IEventAggregator eventAggregator,
                                       IDownloadHistoryService downloadHistoryService,
                                       Logger logger)
         {
             _parsingService = parsingService;
             _historyService = historyService;
+            _formatCalculator = formatCalculator;
             _eventAggregator = eventAggregator;
             _downloadHistoryService = downloadHistoryService;
             _cache = cacheManager.GetCache<TrackedDownload>(GetType());
@@ -140,6 +144,12 @@ namespace NzbDrone.Core.Download.TrackedDownloads
                     }
                 }
 
+                // Calculate custom formats
+                if (trackedDownload.RemoteEpisode != null)
+                {
+                    trackedDownload.RemoteEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(parsedEpisodeInfo);
+                }
+
                 // Track it so it can be displayed in the queue even though we can't determine which series it is for
                 if (trackedDownload.RemoteEpisode == null)
                 {
diff --git a/src/NzbDrone.Core/History/HistoryService.cs b/src/NzbDrone.Core/History/HistoryService.cs
index 1adfb7fb9..f7b22e712 100644
--- a/src/NzbDrone.Core/History/HistoryService.cs
+++ b/src/NzbDrone.Core/History/HistoryService.cs
@@ -39,13 +39,11 @@ namespace NzbDrone.Core.History
                                   IHandle<DownloadIgnoredEvent>
     {
         private readonly IHistoryRepository _historyRepository;
-        private readonly IEpisodeFilePreferredWordCalculator _episodeFilePreferredWordCalculator;
         private readonly Logger _logger;
 
-        public HistoryService(IHistoryRepository historyRepository, IEpisodeFilePreferredWordCalculator episodeFilePreferredWordCalculator, Logger logger)
+        public HistoryService(IHistoryRepository historyRepository, Logger logger)
         {
             _historyRepository = historyRepository;
-            _episodeFilePreferredWordCalculator = episodeFilePreferredWordCalculator;
             _logger = logger;
         }
 
@@ -168,7 +166,7 @@ namespace NzbDrone.Core.History
                 history.Data.Add("TvdbId", message.Episode.Release.TvdbId.ToString());
                 history.Data.Add("TvRageId", message.Episode.Release.TvRageId.ToString());
                 history.Data.Add("Protocol", ((int)message.Episode.Release.DownloadProtocol).ToString());
-                history.Data.Add("PreferredWordScore", message.Episode.PreferredWordScore.ToString());
+                history.Data.Add("CustomFormatScore", message.Episode.CustomFormatScore.ToString());
                 history.Data.Add("SeriesMatchType", message.Episode.SeriesMatchType.ToString());
 
                 if (!message.Episode.ParsedEpisodeInfo.ReleaseHash.IsNullOrWhiteSpace())
@@ -220,7 +218,6 @@ namespace NzbDrone.Core.History
                 history.Data.Add("ImportedPath", Path.Combine(message.EpisodeInfo.Series.Path, message.ImportedEpisode.RelativePath));
                 history.Data.Add("DownloadClient", message.DownloadClientInfo?.Type);
                 history.Data.Add("DownloadClientName", message.DownloadClientInfo?.Name);
-                history.Data.Add("PreferredWordScore", message.EpisodeInfo.PreferredWordScore.ToString());
                 history.Data.Add("ReleaseGroup", message.EpisodeInfo.ReleaseGroup);
 
                 _historyRepository.Insert(history);
@@ -265,8 +262,6 @@ namespace NzbDrone.Core.History
                 return;
             }
 
-            var episodeFilePreferredWordScore = _episodeFilePreferredWordCalculator.Calculate(message.EpisodeFile.Series, message.EpisodeFile);
-
             foreach (var episode in message.EpisodeFile.Episodes.Value)
             {
                 var history = new EpisodeHistory
@@ -281,7 +276,6 @@ namespace NzbDrone.Core.History
                 };
 
                 history.Data.Add("Reason", message.Reason.ToString());
-                history.Data.Add("PreferredWordScore", episodeFilePreferredWordScore.ToString());
                 history.Data.Add("ReleaseGroup", message.EpisodeFile.ReleaseGroup);
 
                 _historyRepository.Insert(history);
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFilePreferredWordCalculator.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFilePreferredWordCalculator.cs
deleted file mode 100644
index dca91f770..000000000
--- a/src/NzbDrone.Core/MediaFiles/EpisodeFilePreferredWordCalculator.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Profiles.Releases;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.MediaFiles
-{
-    public interface IEpisodeFilePreferredWordCalculator
-    {
-        int Calculate(Series series, EpisodeFile episodeFile);
-    }
-
-    public class EpisodeFilePreferredWordCalculator : IEpisodeFilePreferredWordCalculator
-    {
-        private readonly IPreferredWordService _preferredWordService;
-        private readonly Logger _logger;
-
-        public EpisodeFilePreferredWordCalculator(IPreferredWordService preferredWordService, Logger logger)
-        {
-            _preferredWordService = preferredWordService;
-            _logger = logger;
-        }
-
-        public int Calculate(Series series, EpisodeFile episodeFile)
-        {
-            var scores = new List<int>();
-
-            if (episodeFile.SceneName.IsNotNullOrWhiteSpace())
-            {
-                AddScoreIfApplicable(series, episodeFile.SceneName, scores);
-            }
-            else
-            {
-                _logger.Trace("No stored scene name for {0}", episodeFile);
-            }
-
-            // The file may not have a screen name if the file/folder name contained spaces, but the original path is still store and valuable.
-            if (episodeFile.OriginalFilePath.IsNotNullOrWhiteSpace())
-            {
-                var segments = episodeFile.OriginalFilePath.Split(Path.DirectorySeparatorChar).ToList();
-
-                for (int i = 0; i < segments.Count; i++)
-                {
-                    var isLast = i == segments.Count - 1;
-                    var segment = isLast ? Path.GetFileNameWithoutExtension(segments[i]) : segments[i];
-
-                    AddScoreIfApplicable(series, segment, scores);
-                }
-            }
-            else
-            {
-                _logger.Trace("No stored scene name for {0}", episodeFile);
-            }
-
-            // Calculate using RelativePath or Path, but not both
-            if (episodeFile.RelativePath.IsNotNullOrWhiteSpace())
-            {
-                AddScoreIfApplicable(series, episodeFile.RelativePath, scores);
-            }
-            else if (episodeFile.Path.IsNotNullOrWhiteSpace())
-            {
-                AddScoreIfApplicable(series, episodeFile.Path, scores);
-            }
-
-            // Return the highest score, this will allow media info in file names to be used to improve preferred word scoring.
-            // TODO: A full map of preferred words should be de-duped and used to create an aggregated score using the scene name and the file name.
-
-            return scores.MaxOrDefault();
-        }
-
-        private void AddScoreIfApplicable(Series series, string title, List<int> scores)
-        {
-            var score = 0;
-            _logger.Trace("Calculating preferred word score for '{0}'", title);
-
-            var matchingPairs = _preferredWordService.GetMatchingPreferredWordsAndScores(series, title, 0);
-
-            // Only add the score if there are matching terms
-            if (matchingPairs.Any())
-            {
-                score = matchingPairs.Sum(p => p.Value);
-                scores.Add(score);
-            }
-
-            _logger.Trace("Calculated preferred word score for '{0}': {1} ({2} match(es))", title, score, matchingPairs.Count);
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregatePreferredWordScore.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregatePreferredWordScore.cs
deleted file mode 100644
index 2b61a7731..000000000
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregatePreferredWordScore.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
-
-namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators
-{
-    public class AggregatePreferredWordScore : IAggregateLocalEpisode
-    {
-        private readonly IPreferredWordService _preferredWordService;
-
-        public AggregatePreferredWordScore(IPreferredWordService preferredWordService)
-        {
-            _preferredWordService = preferredWordService;
-        }
-
-        public LocalEpisode Aggregate(LocalEpisode localEpisode, DownloadClientItem downloadClientItem)
-        {
-            var series = localEpisode.Series;
-            var scores = new List<int>();
-
-            if (localEpisode.FileEpisodeInfo?.ReleaseTitle != null)
-            {
-                scores.Add(_preferredWordService.Calculate(series, localEpisode.FileEpisodeInfo.ReleaseTitle, 0));
-            }
-
-            if (localEpisode.SceneName != null)
-            {
-                scores.Add(_preferredWordService.Calculate(series, localEpisode.SceneName, 0));
-            }
-
-            localEpisode.PreferredWordScore = scores.MaxOrDefault();
-
-            return localEpisode;
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
index 546573b98..a702a3312 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
@@ -1,6 +1,8 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using NLog;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Languages;
@@ -13,16 +15,15 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
     public class UpgradeSpecification : IImportDecisionEngineSpecification
     {
         private readonly IConfigService _configService;
-        private readonly IEpisodeFilePreferredWordCalculator _episodeFilePreferredWordCalculator;
+        private readonly ICustomFormatCalculationService _customFormatCalculationService;
         private readonly Logger _logger;
 
         public UpgradeSpecification(IConfigService configService,
-                                    IPreferredWordService preferredWordService,
-                                    IEpisodeFilePreferredWordCalculator episodeFilePreferredWordCalculator,
+                                    ICustomFormatCalculationService customFormatCalculationService,
                                     Logger logger)
         {
             _configService = configService;
-            _episodeFilePreferredWordCalculator = episodeFilePreferredWordCalculator;
+            _customFormatCalculationService = customFormatCalculationService;
             _logger = logger;
         }
 
@@ -31,7 +32,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
             var downloadPropersAndRepacks = _configService.DownloadPropersAndRepacks;
             var qualityComparer = new QualityModelComparer(localEpisode.Series.QualityProfile);
             var languageComparer = new LanguageComparer(localEpisode.Series.LanguageProfile);
-            var preferredWordScore = localEpisode.PreferredWordScore;
 
             foreach (var episode in localEpisode.Episodes.Where(e => e.EpisodeFileId > 0))
             {
@@ -45,6 +45,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
 
                 var qualityCompare = qualityComparer.Compare(localEpisode.Quality.Quality, episodeFile.Quality.Quality);
                 var languageCompare = languageComparer.Compare(localEpisode.Language, episodeFile.Language);
+                var customFormatScore = GetCustomFormatScore(localEpisode);
 
                 if (qualityCompare < 0)
                 {
@@ -71,16 +72,45 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
                     return Decision.Reject("Not a language upgrade for existing episode file(s)");
                 }
 
-                var episodeFilePreferredWordScore = _episodeFilePreferredWordCalculator.Calculate(localEpisode.Series, episodeFile);
+                var customFormats = _customFormatCalculationService.ParseCustomFormat(episodeFile);
+                var episodeFileCustomFormatScore = localEpisode.Series.QualityProfile.Value.CalculateCustomFormatScore(customFormats);
 
-                if (qualityCompare == 0 && languageCompare == 0 && preferredWordScore < episodeFilePreferredWordScore)
+                if (qualityCompare == 0 && customFormatScore < episodeFileCustomFormatScore)
                 {
-                    _logger.Debug("This file isn't a preferred word upgrade for all episodes. Skipping {0}", localEpisode.Path);
-                    return Decision.Reject("Not a preferred word upgrade for existing episode file(s)");
+                    _logger.Debug("This file isn't a custom format upgrade for episode. Skipping {0}", localEpisode.Path);
+                    return Decision.Reject("Not a custom format upgrade for existing episode file(s)");
                 }
             }
 
             return Decision.Accept();
         }
+
+        private int GetCustomFormatScore(LocalEpisode localEpisode)
+        {
+            var series = localEpisode.Series;
+            var scores = new List<int>();
+            var fileFormats = new List<CustomFormat>();
+            var folderFormats = new List<CustomFormat>();
+            var clientFormats = new List<CustomFormat>();
+
+            if (localEpisode.FileEpisodeInfo != null)
+            {
+                fileFormats = _customFormatCalculationService.ParseCustomFormat(localEpisode.FileEpisodeInfo);
+            }
+
+            if (localEpisode.FolderEpisodeInfo != null)
+            {
+                folderFormats = _customFormatCalculationService.ParseCustomFormat(localEpisode.FolderEpisodeInfo);
+            }
+
+            if (localEpisode.DownloadClientEpisodeInfo != null)
+            {
+                clientFormats = _customFormatCalculationService.ParseCustomFormat(localEpisode.DownloadClientEpisodeInfo);
+            }
+
+            var formats = fileFormats.Union(folderFormats.Union(clientFormats)).ToList();
+
+            return series.QualityProfile.Value.CalculateCustomFormatScore(formats);
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index ce79519d7..f80a7bef3 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -9,11 +9,10 @@ using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnsureThat;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.MediaInfo;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 
@@ -21,8 +20,8 @@ namespace NzbDrone.Core.Organizer
 {
     public interface IBuildFileNames
     {
-        string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension = "", NamingConfig namingConfig = null, PreferredWordMatchResults preferredWords = null);
-        string BuildFilePath(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension, NamingConfig namingConfig = null, PreferredWordMatchResults preferredWords = null);
+        string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension = "", NamingConfig namingConfig = null, List<CustomFormat> customFormats = null);
+        string BuildFilePath(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null);
         string BuildSeasonPath(Series series, int seasonNumber);
         BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec);
         string GetSeriesFolder(Series series, NamingConfig namingConfig = null);
@@ -38,8 +37,8 @@ namespace NzbDrone.Core.Organizer
 
         private readonly INamingConfigService _namingConfigService;
         private readonly IQualityDefinitionService _qualityDefinitionService;
-        private readonly IPreferredWordService _preferredWordService;
         private readonly IUpdateMediaInfo _mediaInfoUpdater;
+        private readonly ICustomFormatService _formatService;
         private readonly ICached<EpisodeFormat[]> _episodeFormatCache;
         private readonly ICached<AbsoluteEpisodeFormat[]> _absoluteEpisodeFormatCache;
         private readonly ICached<bool> _requiresEpisodeTitleCache;
@@ -115,14 +114,14 @@ namespace NzbDrone.Core.Organizer
         public FileNameBuilder(INamingConfigService namingConfigService,
                                IQualityDefinitionService qualityDefinitionService,
                                ICacheManager cacheManager,
-                               IPreferredWordService preferredWordService,
                                IUpdateMediaInfo mediaInfoUpdater,
+                               ICustomFormatService formatService,
                                Logger logger)
         {
             _namingConfigService = namingConfigService;
             _qualityDefinitionService = qualityDefinitionService;
-            _preferredWordService = preferredWordService;
             _mediaInfoUpdater = mediaInfoUpdater;
+            _formatService = formatService;
             _episodeFormatCache = cacheManager.GetCache<EpisodeFormat[]>(GetType(), "episodeFormat");
             _absoluteEpisodeFormatCache = cacheManager.GetCache<AbsoluteEpisodeFormat[]>(GetType(), "absoluteEpisodeFormat");
             _requiresEpisodeTitleCache = cacheManager.GetCache<bool>(GetType(), "requiresEpisodeTitle");
@@ -131,7 +130,7 @@ namespace NzbDrone.Core.Organizer
             _logger = logger;
         }
 
-        private string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension, int maxPath, NamingConfig namingConfig = null, PreferredWordMatchResults preferredWords = null)
+        private string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension, int maxPath, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null)
         {
             if (namingConfig == null)
             {
@@ -193,7 +192,7 @@ namespace NzbDrone.Core.Organizer
                 AddEpisodeFileTokens(tokenHandlers, episodeFile, !patternHasEpisodeIdentifier || episodeFile.Id == 0);
                 AddQualityTokens(tokenHandlers, series, episodeFile);
                 AddMediaInfoTokens(tokenHandlers, episodeFile);
-                AddPreferredWords(tokenHandlers, series, episodeFile, preferredWords);
+                AddCustomFormats(tokenHandlers, series, episodeFile, customFormats);
 
                 var component = ReplaceTokens(splitPattern, tokenHandlers, namingConfig, true).Trim();
                 var maxPathSegmentLength = Math.Min(LongPathSupport.MaxFileNameLength, maxPath);
@@ -218,18 +217,18 @@ namespace NzbDrone.Core.Organizer
             return string.Join(Path.DirectorySeparatorChar.ToString(), components) + extension;
         }
 
-        public string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension = "", NamingConfig namingConfig = null, PreferredWordMatchResults preferredWords = null)
+        public string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension = "", NamingConfig namingConfig = null, List<CustomFormat> customFormats = null)
         {
-            return BuildFileName(episodes, series, episodeFile, extension, LongPathSupport.MaxFilePathLength, namingConfig, preferredWords);
+            return BuildFileName(episodes, series, episodeFile, extension, LongPathSupport.MaxFilePathLength, namingConfig, customFormats);
         }
 
-        public string BuildFilePath(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension, NamingConfig namingConfig = null, PreferredWordMatchResults preferredWords = null)
+        public string BuildFilePath(List<Episode> episodes, Series series, EpisodeFile episodeFile, string extension, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null)
         {
             Ensure.That(extension, () => extension).IsNotNullOrWhiteSpace();
 
             var seasonPath = BuildSeasonPath(series, episodes.First().SeasonNumber);
             var remainingPathLength = LongPathSupport.MaxFilePathLength - seasonPath.GetByteCount() - 1;
-            var fileName = BuildFileName(episodes, series, episodeFile, extension, remainingPathLength, namingConfig, preferredWords);
+            var fileName = BuildFileName(episodes, series, episodeFile, extension, remainingPathLength, namingConfig, customFormats);
 
             return Path.Combine(seasonPath, fileName);
         }
@@ -690,6 +689,17 @@ namespace NzbDrone.Core.Organizer
                 m => MediaInfoFormatter.FormatVideoDynamicRangeType(episodeFile.MediaInfo);
         }
 
+        private void AddCustomFormats(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Series series, EpisodeFile episodeFile, List<CustomFormat> customFormats = null)
+        {
+            if (customFormats == null)
+            {
+                episodeFile.Series = series;
+                customFormats = CustomFormatCalculationService.ParseCustomFormat(episodeFile, _formatService.All());
+            }
+
+            tokenHandlers["{Custom Formats}"] = m => string.Join(" ", customFormats.Where(x => x.IncludeCustomFormatWhenRenaming));
+        }
+
         private void AddIdTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Series series)
         {
             tokenHandlers["{ImdbId}"] = m => series.ImdbId ?? string.Empty;
@@ -697,36 +707,6 @@ namespace NzbDrone.Core.Organizer
             tokenHandlers["{TvMazeId}"] = m => series.TvMazeId > 0 ? series.TvMazeId.ToString() : string.Empty;
         }
 
-        private void AddPreferredWords(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Series series, EpisodeFile episodeFile, PreferredWordMatchResults preferredWords = null)
-        {
-            if (preferredWords == null)
-            {
-                preferredWords = _preferredWordService.GetMatchingPreferredWords(series, episodeFile.GetSceneOrFileName());
-            }
-
-            tokenHandlers["{Preferred Words}"] = m =>
-            {
-                var profileName = "";
-
-                if (m.CustomFormat != null)
-                {
-                    profileName = m.CustomFormat.Trim();
-                }
-
-                if (profileName.IsNullOrWhiteSpace())
-                {
-                    return string.Join(" ", preferredWords.All);
-                }
-
-                if (preferredWords.ByReleaseProfile.TryGetValue(profileName, out var profilePreferredWords))
-                {
-                    return string.Join(" ", profilePreferredWords);
-                }
-
-                return string.Empty;
-            };
-        }
-
         private string GetLanguagesToken(List<string> mediaInfoLanguages, string filter, bool skipEnglishOnly, bool quoted)
         {
             var tokens = new List<string>();
diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
index 12160cc61..41e844730 100644
--- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.MediaInfo;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Organizer
         private static EpisodeFile _dailyEpisodeFile;
         private static EpisodeFile _animeEpisodeFile;
         private static EpisodeFile _animeMultiEpisodeFile;
-        private static PreferredWordMatchResults _preferredWords;
+        private static List<CustomFormat> _customFormats;
 
         public FileNameSampleService(IBuildFileNames buildFileNames)
         {
@@ -126,6 +126,20 @@ namespace NzbDrone.Core.Organizer
                 Subtitles = new List<string> { "jpn", "eng" }
             };
 
+            _customFormats = new List<CustomFormat>
+            {
+                new CustomFormat
+                {
+                    Name = "Surround Sound",
+                    IncludeCustomFormatWhenRenaming = true
+                },
+                new CustomFormat
+                {
+                    Name = "x264",
+                    IncludeCustomFormatWhenRenaming = true
+                }
+            };
+
             _singleEpisodeFile = new EpisodeFile
             {
                 Quality = new QualityModel(Quality.HDTV720p, new Revision(2)),
@@ -170,18 +184,13 @@ namespace NzbDrone.Core.Organizer
                 ReleaseGroup = "RlsGrp",
                 MediaInfo = mediaInfoAnime
             };
-
-            _preferredWords = new PreferredWordMatchResults()
-            {
-                All = new List<string>() { "iNTERNAL" }
-            };
         }
 
         public SampleResult GetStandardSample(NamingConfig nameSpec)
         {
             var result = new SampleResult
             {
-                FileName = BuildSample(_singleEpisode, _standardSeries, _singleEpisodeFile, nameSpec),
+                FileName = BuildSample(_singleEpisode, _standardSeries, _singleEpisodeFile, nameSpec, _customFormats),
                 Series = _standardSeries,
                 Episodes = _singleEpisode,
                 EpisodeFile = _singleEpisodeFile
@@ -194,7 +203,7 @@ namespace NzbDrone.Core.Organizer
         {
             var result = new SampleResult
             {
-                FileName = BuildSample(_multiEpisodes, _standardSeries, _multiEpisodeFile, nameSpec),
+                FileName = BuildSample(_multiEpisodes, _standardSeries, _multiEpisodeFile, nameSpec, _customFormats),
                 Series = _standardSeries,
                 Episodes = _multiEpisodes,
                 EpisodeFile = _multiEpisodeFile
@@ -207,7 +216,7 @@ namespace NzbDrone.Core.Organizer
         {
             var result = new SampleResult
             {
-                FileName = BuildSample(_singleEpisode, _dailySeries, _dailyEpisodeFile, nameSpec),
+                FileName = BuildSample(_singleEpisode, _dailySeries, _dailyEpisodeFile, nameSpec, _customFormats),
                 Series = _dailySeries,
                 Episodes = _singleEpisode,
                 EpisodeFile = _dailyEpisodeFile
@@ -220,7 +229,7 @@ namespace NzbDrone.Core.Organizer
         {
             var result = new SampleResult
             {
-                FileName = BuildSample(_singleEpisode, _animeSeries, _animeEpisodeFile, nameSpec),
+                FileName = BuildSample(_singleEpisode, _animeSeries, _animeEpisodeFile, nameSpec, _customFormats),
                 Series = _animeSeries,
                 Episodes = _singleEpisode,
                 EpisodeFile = _animeEpisodeFile
@@ -233,7 +242,7 @@ namespace NzbDrone.Core.Organizer
         {
             var result = new SampleResult
             {
-                FileName = BuildSample(_multiEpisodes, _animeSeries, _animeMultiEpisodeFile, nameSpec),
+                FileName = BuildSample(_multiEpisodes, _animeSeries, _animeMultiEpisodeFile, nameSpec, _customFormats),
                 Series = _animeSeries,
                 Episodes = _multiEpisodes,
                 EpisodeFile = _animeMultiEpisodeFile
@@ -257,11 +266,11 @@ namespace NzbDrone.Core.Organizer
             return _buildFileNames.GetSeasonFolder(_standardSeries, 0, nameSpec);
         }
 
-        private string BuildSample(List<Episode> episodes, Series series, EpisodeFile episodeFile, NamingConfig nameSpec)
+        private string BuildSample(List<Episode> episodes, Series series, EpisodeFile episodeFile, NamingConfig nameSpec, List<CustomFormat> customFormats)
         {
             try
             {
-                return _buildFileNames.BuildFileName(episodes, series, episodeFile, "", nameSpec, _preferredWords);
+                return _buildFileNames.BuildFileName(episodes, series, episodeFile, "", nameSpec, customFormats);
             }
             catch (NamingFormatException)
             {
diff --git a/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs b/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs
index 2ef542331..efc0d91d4 100644
--- a/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs
+++ b/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs
@@ -29,7 +29,6 @@ namespace NzbDrone.Core.Parser.Model
         public bool SceneSource { get; set; }
         public string ReleaseGroup { get; set; }
         public string SceneName { get; set; }
-        public int PreferredWordScore { get; set; }
         public bool OtherVideoFiles { get; set; }
 
         public int SeasonNumber
diff --git a/src/NzbDrone.Core/Parser/Model/ParsedEpisodeInfo.cs b/src/NzbDrone.Core/Parser/Model/ParsedEpisodeInfo.cs
index 994a77698..24b6bbec7 100644
--- a/src/NzbDrone.Core/Parser/Model/ParsedEpisodeInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ParsedEpisodeInfo.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
@@ -28,6 +30,9 @@ namespace NzbDrone.Core.Parser.Model
         public string ReleaseTokens { get; set; }
         public int? DailyPart { get; set; }
 
+        [JsonIgnore]
+        public Dictionary<string, object> ExtraInfo { get; set; } = new Dictionary<string, object>();
+
         public ParsedEpisodeInfo()
         {
             EpisodeNumbers = new int[0];
diff --git a/src/NzbDrone.Core/Parser/Model/RemoteEpisode.cs b/src/NzbDrone.Core/Parser/Model/RemoteEpisode.cs
index 6bf8b7bc5..4696cdbed 100644
--- a/src/NzbDrone.Core/Parser/Model/RemoteEpisode.cs
+++ b/src/NzbDrone.Core/Parser/Model/RemoteEpisode.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Tv;
@@ -19,12 +20,14 @@ namespace NzbDrone.Core.Parser.Model
         public bool EpisodeRequested { 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 SeriesMatchType SeriesMatchType { get; set; }
 
         public RemoteEpisode()
         {
             Episodes = new List<Episode>();
+            CustomFormats = new List<CustomFormat>();
         }
 
         public bool IsRecentEpisode()
diff --git a/src/NzbDrone.Core/Profiles/ProfileFormatItem.cs b/src/NzbDrone.Core/Profiles/ProfileFormatItem.cs
new file mode 100644
index 000000000..30b3582ee
--- /dev/null
+++ b/src/NzbDrone.Core/Profiles/ProfileFormatItem.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Profiles
+{
+    public class ProfileFormatItem : IEmbeddedDocument
+    {
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+        public int Id { get; set; }
+        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 8833492a5..f8a214042 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 FirststAllowedQuality()
@@ -77,5 +86,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..723fc6223 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,34 @@ 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)
+            {
+                foreach (var formatItem in profile.FormatItems)
+                {
+                    formatItem.Format = cfs[formatItem.Format.Id];
+                }
+            }
+
+            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 208fb52b9..248c702ff 100644
--- a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs
+++ b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.CustomFormats.Events;
 using NzbDrone.Core.ImportLists;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
@@ -20,17 +22,26 @@ 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 IImportListFactory _importListFactory;
+        private readonly ICustomFormatService _formatService;
         private readonly ISeriesService _seriesService;
         private readonly Logger _logger;
 
-        public QualityProfileService(IProfileRepository profileRepository, IImportListFactory importListFactory, ISeriesService seriesService, Logger logger)
+        public QualityProfileService(IProfileRepository profileRepository,
+                                     IImportListFactory importListFactory,
+                                     ICustomFormatService formatService,
+                                     ISeriesService seriesService,
+                                     Logger logger)
         {
             _profileRepository = profileRepository;
             _importListFactory = importListFactory;
+            _formatService = formatService;
             _seriesService = seriesService;
             _logger = logger;
         }
@@ -135,6 +146,37 @@ namespace NzbDrone.Core.Profiles.Qualities
                 Quality.Bluray1080p);
         }
 
+        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.Any())
+                {
+                    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.Weight);
@@ -174,11 +216,21 @@ namespace NzbDrone.Core.Profiles.Qualities
                 groupId++;
             }
 
+            var formatItems = _formatService.All().Select(format => new ProfileFormatItem
+            {
+                Id = format.Id,
+                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/PreferredWordMatchResults.cs b/src/NzbDrone.Core/Profiles/Releases/PreferredWordMatchResults.cs
deleted file mode 100644
index 3a9444b65..000000000
--- a/src/NzbDrone.Core/Profiles/Releases/PreferredWordMatchResults.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NzbDrone.Core.Profiles.Releases
-{
-    public class PreferredWordMatchResults
-    {
-        public List<string> All
-        {
-            get;
-            set;
-        }
-
-        public Dictionary<string, List<string>> ByReleaseProfile
-        {
-            get;
-            set;
-        }
-
-        public PreferredWordMatchResults()
-        {
-            All = new List<string>();
-            ByReleaseProfile = new Dictionary<string, List<string>>();
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs b/src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs
deleted file mode 100644
index 73505cb7b..000000000
--- a/src/NzbDrone.Core/Profiles/Releases/PreferredWordService.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Profiles.Releases
-{
-    public interface IPreferredWordService
-    {
-        int Calculate(Series series, string title, int indexerId);
-        List<KeyValuePair<string, int>> GetMatchingPreferredWordsAndScores(Series series, string title, int indexerId);
-        PreferredWordMatchResults GetMatchingPreferredWords(Series series, 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(Series series, string title, int indexerId)
-        {
-            _logger.Trace("Calculating preferred word score for '{0}'", title);
-
-            var matchingPairs = GetMatchingPreferredWordsAndScores(series, title, indexerId);
-            var score = matchingPairs.Sum(p => p.Value);
-
-            _logger.Trace("Calculated preferred word score for '{0}': {1} ({2} match(es))", title, score, matchingPairs.Count);
-
-            return score;
-        }
-
-        public List<KeyValuePair<string, int>> GetMatchingPreferredWordsAndScores(Series series, string title, int indexerId)
-        {
-            var releaseProfiles = _releaseProfileService.EnabledForTags(series.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);
-                    }
-                }
-            }
-
-            return matchingPairs;
-        }
-
-        public PreferredWordMatchResults GetMatchingPreferredWords(Series series, string title)
-        {
-            var releaseProfiles = _releaseProfileService.EnabledForTags(series.Tags, 0);
-            var profileWords = new Dictionary<string, List<KeyValuePair<string, int>>>();
-            var allWords = new List<KeyValuePair<string, int>>();
-
-            _logger.Trace("Determining preferred word matches for '{0}'", title);
-
-            foreach (var releaseProfile in releaseProfiles)
-            {
-                var matchingPairs = new List<KeyValuePair<string, int>>();
-
-                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));
-                    }
-                }
-
-                if (matchingPairs.Count > 0)
-                {
-                    if (releaseProfile.Name.IsNotNullOrWhiteSpace())
-                    {
-                        var profileName = releaseProfile.Name.Trim();
-
-                        if (!profileWords.ContainsKey(profileName))
-                        {
-                            profileWords.Add(profileName, new List<KeyValuePair<string, int>>());
-                        }
-
-                        profileWords[profileName].AddRange(matchingPairs);
-                    }
-
-                    allWords.AddRange(matchingPairs); // Add the "everything grouping"
-                }
-            }
-
-            var results = new PreferredWordMatchResults()
-            {
-                All = allWords.OrderByDescending(m => m.Value).Select(m => m.Key).ToList(),
-                ByReleaseProfile = profileWords.ToDictionary(item => item.Key, item => item.Value.OrderByDescending(m => m.Value).Select(m => m.Key).ToList())
-            };
-
-            _logger.Trace("Determined preferred word matches for '{0}'. Count {1}", title, allWords.Count);
-
-            return results;
-        }
-  }
-}
diff --git a/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs b/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs
index bd29da39f..75e23fab9 100644
--- a/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs
+++ b/src/NzbDrone.Core/Profiles/Releases/ReleaseProfile.cs
@@ -9,8 +9,6 @@ namespace NzbDrone.Core.Profiles.Releases
         public bool Enabled { get; set; }
         public List<string> Required { get; set; }
         public List<string> Ignored { get; set; }
-        public List<KeyValuePair<string, int>> Preferred { get; set; }
-        public bool IncludePreferredWhenRenaming { get; set; }
         public int IndexerId { get; set; }
         public HashSet<int> Tags { get; set; }
 
@@ -19,8 +17,6 @@ namespace NzbDrone.Core.Profiles.Releases
             Enabled = true;
             Required = new List<string>();
             Ignored = new List<string>();
-            Preferred = new List<KeyValuePair<string, int>>();
-            IncludePreferredWhenRenaming = true;
             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/Sonarr.Api.V3/Blocklist/BlocklistController.cs b/src/Sonarr.Api.V3/Blocklist/BlocklistController.cs
index c3a049916..c3c29b916 100644
--- a/src/Sonarr.Api.V3/Blocklist/BlocklistController.cs
+++ b/src/Sonarr.Api.V3/Blocklist/BlocklistController.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Blocklisting;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using Sonarr.Http;
 using Sonarr.Http.Extensions;
@@ -11,10 +12,13 @@ namespace Sonarr.Api.V3.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 Sonarr.Api.V3.Blocklist
             var pagingResource = Request.ReadPagingResourceFromRequest<BlocklistResource>();
             var pagingSpec = pagingResource.MapToPagingSpec<BlocklistResource, NzbDrone.Core.Blocklisting.Blocklist>("date", SortDirection.Descending);
 
-            return pagingSpec.ApplyToPage(_blocklistService.Paged, model => BlocklistResourceMapper.MapToResource(model));
+            return pagingSpec.ApplyToPage(_blocklistService.Paged, model => BlocklistResourceMapper.MapToResource(model, _formatCalculator));
         }
 
         [RestDeleteById]
diff --git a/src/Sonarr.Api.V3/Blocklist/BlocklistResource.cs b/src/Sonarr.Api.V3/Blocklist/BlocklistResource.cs
index 485be42a1..6bfb24669 100644
--- a/src/Sonarr.Api.V3/Blocklist/BlocklistResource.cs
+++ b/src/Sonarr.Api.V3/Blocklist/BlocklistResource.cs
@@ -1,8 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
+using Sonarr.Api.V3.CustomFormats;
 using Sonarr.Api.V3.Series;
 using Sonarr.Http.REST;
 
@@ -15,6 +17,7 @@ namespace Sonarr.Api.V3.Blocklist
         public string SourceTitle { get; set; }
         public Language Language { 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; }
@@ -25,7 +28,7 @@ namespace Sonarr.Api.V3.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)
             {
@@ -41,6 +44,7 @@ namespace Sonarr.Api.V3.Blocklist
                 SourceTitle = model.SourceTitle,
                 Language = model.Language,
                 Quality = model.Quality,
+                CustomFormats = formatCalculator.ParseCustomFormat(model).ToResource(),
                 Date = model.Date,
                 Protocol = model.Protocol,
                 Indexer = model.Indexer,
diff --git a/src/Sonarr.Api.V3/CustomFormats/CustomFormatController.cs b/src/Sonarr.Api.V3/CustomFormats/CustomFormatController.cs
new file mode 100644
index 000000000..eda1e1ccc
--- /dev/null
+++ b/src/Sonarr.Api.V3/CustomFormats/CustomFormatController.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentValidation;
+using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.CustomFormats;
+using Sonarr.Http;
+using Sonarr.Http.REST;
+using Sonarr.Http.REST.Attributes;
+
+namespace Sonarr.Api.V3.CustomFormats
+{
+    [V3ApiController]
+    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");
+                }
+            });
+        }
+
+        protected override CustomFormatResource GetResourceById(int id)
+        {
+            return _formatService.GetById(id).ToResource();
+        }
+
+        [RestPostById]
+        public ActionResult<CustomFormatResource> Create(CustomFormatResource customFormatResource)
+        {
+            var model = customFormatResource.ToModel(_specifications);
+            return Created(_formatService.Insert(model).Id);
+        }
+
+        [RestPutById]
+        public ActionResult<CustomFormatResource> Update(CustomFormatResource resource)
+        {
+            var model = resource.ToModel(_specifications);
+            _formatService.Update(model);
+
+            return Accepted(model.Id);
+        }
+
+        [HttpGet]
+        public List<CustomFormatResource> GetAll()
+        {
+            return _formatService.All().ToResource();
+        }
+
+        [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 = "x264",
+                Value = @"(x|h)\.?264"
+            };
+
+            yield return new ReleaseTitleSpecification
+            {
+                Name = "x265",
+                Value = @"(((x|h)\.?265)|(HEVC))"
+            };
+
+            yield return new ReleaseTitleSpecification
+            {
+                Name = "Simple Hardcoded Subs",
+                Value = @"subs?"
+            };
+
+            yield return new ReleaseTitleSpecification
+            {
+                Name = "Hardcoded Subs",
+                Value = @"\b(?<hcsub>(\w+SUBS?)\b)|(?<hc>(HC|SUBBED))\b"
+            };
+
+            yield return new ReleaseTitleSpecification
+            {
+                Name = "Surround Sound",
+                Value = @"DTS.?(HD|ES|X(?!\D))|TRUEHD|ATMOS|DD(\+|P).?([5-9])|EAC3.?([5-9])"
+            };
+
+            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/Sonarr.Api.V3/CustomFormats/CustomFormatResource.cs b/src/Sonarr.Api.V3/CustomFormats/CustomFormatResource.cs
new file mode 100644
index 000000000..e6962c0e2
--- /dev/null
+++ b/src/Sonarr.Api.V3/CustomFormats/CustomFormatResource.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using NzbDrone.Core.CustomFormats;
+using Sonarr.Http.ClientSchema;
+using Sonarr.Http.REST;
+
+namespace Sonarr.Api.V3.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)
+        {
+            return new CustomFormatResource
+            {
+                Id = model.Id,
+                Name = model.Name,
+                IncludeCustomFormatWhenRenaming = model.IncludeCustomFormatWhenRenaming,
+                Specifications = model.Specifications.Select(x => x.ToSchema()).ToList()
+            };
+        }
+
+        public static List<CustomFormatResource> ToResource(this IEnumerable<CustomFormat> models)
+        {
+            return models.Select(m => m.ToResource()).ToList();
+        }
+
+        public static CustomFormat ToModel(this CustomFormatResource resource, List<ICustomFormatSpecification> specifications)
+        {
+            return new CustomFormat
+            {
+                Id = resource.Id,
+                Name = resource.Name,
+                IncludeCustomFormatWhenRenaming = resource.IncludeCustomFormatWhenRenaming,
+                Specifications = resource.Specifications.Select(x => MapSpecification(x, specifications)).ToList()
+            };
+        }
+
+        private static ICustomFormatSpecification MapSpecification(CustomFormatSpecificationSchema resource, List<ICustomFormatSpecification> specifications)
+        {
+            var type = specifications.SingleOrDefault(x => x.GetType().Name == resource.Implementation).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/Sonarr.Api.V3/CustomFormats/CustomFormatSpecificationSchema.cs b/src/Sonarr.Api.V3/CustomFormats/CustomFormatSpecificationSchema.cs
new file mode 100644
index 000000000..a7335a13a
--- /dev/null
+++ b/src/Sonarr.Api.V3/CustomFormats/CustomFormatSpecificationSchema.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using NzbDrone.Core.CustomFormats;
+using Sonarr.Http.ClientSchema;
+using Sonarr.Http.REST;
+
+namespace Sonarr.Api.V3.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/Sonarr.Api.V3/EpisodeFiles/EpisodeFileController.cs b/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileController.cs
index 2532ed14f..ac4a121c6 100644
--- a/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileController.cs
+++ b/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileController.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Exceptions;
@@ -11,6 +12,7 @@ using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Tv;
 using NzbDrone.SignalR;
+using Sonarr.Api.V3.CustomFormats;
 using Sonarr.Http;
 using Sonarr.Http.REST;
 using Sonarr.Http.REST.Attributes;
@@ -26,18 +28,21 @@ namespace Sonarr.Api.V3.EpisodeFiles
         private readonly IMediaFileService _mediaFileService;
         private readonly IDeleteMediaFiles _mediaFileDeletionService;
         private readonly ISeriesService _seriesService;
+        private readonly ICustomFormatCalculationService _formatCalculator;
         private readonly IUpgradableSpecification _upgradableSpecification;
 
         public EpisodeFileController(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
                              IDeleteMediaFiles mediaFileDeletionService,
                              ISeriesService seriesService,
+                             ICustomFormatCalculationService formatCalculator,
                              IUpgradableSpecification upgradableSpecification)
             : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
             _mediaFileDeletionService = mediaFileDeletionService;
             _seriesService = seriesService;
+            _formatCalculator = formatCalculator;
             _upgradableSpecification = upgradableSpecification;
         }
 
@@ -46,7 +51,10 @@ namespace Sonarr.Api.V3.EpisodeFiles
             var episodeFile = _mediaFileService.Get(id);
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
 
-            return episodeFile.ToResource(series, _upgradableSpecification);
+            var resource = episodeFile.ToResource(series, _upgradableSpecification);
+            resource.CustomFormats = _formatCalculator.ParseCustomFormat(episodeFile).ToResource();
+
+            return resource;
         }
 
         [HttpGet]
@@ -60,8 +68,26 @@ namespace Sonarr.Api.V3.EpisodeFiles
             if (seriesId.HasValue)
             {
                 var series = _seriesService.GetSeries(seriesId.Value);
+                var files = _mediaFileService.GetFilesBySeries(seriesId.Value);
 
-                return _mediaFileService.GetFilesBySeries(seriesId.Value).ConvertAll(f => f.ToResource(series, _upgradableSpecification));
+                if (files == null)
+                {
+                    return new List<EpisodeFileResource>();
+                }
+
+                var resources = new List<EpisodeFileResource>();
+
+                foreach (var file in files)
+                {
+                    var resource = file.ToResource(series, _upgradableSpecification);
+                    file.Series = series;
+
+                    resource.CustomFormats = _formatCalculator.ParseCustomFormat(file).ToResource();
+
+                    resources.Add(resource);
+                }
+
+                return resources;
             }
             else
             {
diff --git a/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileResource.cs b/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileResource.cs
index 944c24dcd..113fc4684 100644
--- a/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileResource.cs
+++ b/src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileResource.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Qualities;
+using Sonarr.Api.V3.CustomFormats;
 using Sonarr.Http.REST;
 
 namespace Sonarr.Api.V3.EpisodeFiles
@@ -21,6 +23,7 @@ namespace Sonarr.Api.V3.EpisodeFiles
         public string ReleaseGroup { get; set; }
         public Language Language { get; set; }
         public QualityModel Quality { get; set; }
+        public List<CustomFormatResource> CustomFormats { get; set; }
         public MediaInfoResource MediaInfo { get; set; }
 
         public bool QualityCutoffNotMet { get; set; }
diff --git a/src/Sonarr.Api.V3/History/HistoryController.cs b/src/Sonarr.Api.V3/History/HistoryController.cs
index 31e72864c..e43bef339 100644
--- a/src/Sonarr.Api.V3/History/HistoryController.cs
+++ b/src/Sonarr.Api.V3/History/HistoryController.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Download;
@@ -17,21 +18,24 @@ namespace Sonarr.Api.V3.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(EpisodeHistory model, bool includeSeries, bool includeEpisode)
         {
-            var resource = model.ToResource();
+            var resource = model.ToResource(_formatCalculator);
 
             if (includeSeries)
             {
diff --git a/src/Sonarr.Api.V3/History/HistoryResource.cs b/src/Sonarr.Api.V3/History/HistoryResource.cs
index c412c209c..aad162464 100644
--- a/src/Sonarr.Api.V3/History/HistoryResource.cs
+++ b/src/Sonarr.Api.V3/History/HistoryResource.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
+using Sonarr.Api.V3.CustomFormats;
 using Sonarr.Api.V3.Episodes;
 using Sonarr.Api.V3.Series;
 using Sonarr.Http.REST;
@@ -16,6 +18,7 @@ namespace Sonarr.Api.V3.History
         public string SourceTitle { get; set; }
         public Language Language { get; set; }
         public QualityModel Quality { get; set; }
+        public List<CustomFormatResource> CustomFormats { get; set; }
         public bool QualityCutoffNotMet { get; set; }
         public bool LanguageCutoffNotMet { get; set; }
         public DateTime Date { get; set; }
@@ -31,7 +34,7 @@ namespace Sonarr.Api.V3.History
 
     public static class HistoryResourceMapper
     {
-        public static HistoryResource ToResource(this EpisodeHistory model)
+        public static HistoryResource ToResource(this EpisodeHistory model, ICustomFormatCalculationService formatCalculator)
         {
             if (model == null)
             {
@@ -47,6 +50,7 @@ namespace Sonarr.Api.V3.History
                 SourceTitle = model.SourceTitle,
                 Language = model.Language,
                 Quality = model.Quality,
+                CustomFormats = formatCalculator.ParseCustomFormat(model).ToResource(),
 
                 //QualityCutoffNotMet
                 Date = model.Date,
diff --git a/src/Sonarr.Api.V3/Indexers/ReleaseResource.cs b/src/Sonarr.Api.V3/Indexers/ReleaseResource.cs
index 8563cad9c..cce7d8b7a 100644
--- a/src/Sonarr.Api.V3/Indexers/ReleaseResource.cs
+++ b/src/Sonarr.Api.V3/Indexers/ReleaseResource.cs
@@ -7,6 +7,7 @@ using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
+using Sonarr.Api.V3.CustomFormats;
 using Sonarr.Api.V3.Series;
 using Sonarr.Http.REST;
 
@@ -52,7 +53,8 @@ namespace Sonarr.Api.V3.Indexers
         public bool EpisodeRequested { 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 AlternateTitleResource SceneMapping { get; set; }
 
         public string MagnetUrl { get; set; }
@@ -124,7 +126,8 @@ namespace Sonarr.Api.V3.Indexers
                 DownloadAllowed = remoteEpisode.DownloadAllowed,
 
                 //ReleaseWeight
-                PreferredWordScore = remoteEpisode.PreferredWordScore,
+                CustomFormatScore = remoteEpisode.CustomFormatScore,
+                CustomFormats = remoteEpisode.CustomFormats?.ToResource(),
                 SceneMapping = remoteEpisode.SceneMapping.ToResource(),
 
                 MagnetUrl = torrentInfo.MagnetUrl,
diff --git a/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileController.cs b/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileController.cs
index cf4950f5b..18dae403e 100644
--- a/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileController.cs
+++ b/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileController.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using FluentValidation;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Profiles.Qualities;
 using Sonarr.Http;
 using Sonarr.Http.REST;
@@ -14,13 +15,31 @@ namespace Sonarr.Api.V3.Profiles.Quality
     public class QualityProfileController : RestController<QualityProfileResource>
     {
         private readonly IQualityProfileService _profileService;
+        private readonly ICustomFormatService _formatService;
 
-        public QualityProfileController(IQualityProfileService profileService)
+        public QualityProfileController(IQualityProfileService profileService, ICustomFormatService formatService)
         {
             _profileService = profileService;
+            _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/Sonarr.Api.V3/Profiles/Quality/QualityProfileResource.cs b/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileResource.cs
index d9323c657..8f7fef948 100644
--- a/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileResource.cs
+++ b/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileResource.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Profiles.Qualities;
 using Sonarr.Http.REST;
 
@@ -11,6 +13,9 @@ namespace Sonarr.Api.V3.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 Sonarr.Api.V3.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)
@@ -42,6 +54,9 @@ namespace Sonarr.Api.V3.Profiles.Quality
                 UpgradeAllowed = model.UpgradeAllowed,
                 Cutoff = model.Cutoff,
                 Items = model.Items.ConvertAll(ToResource),
+                MinFormatScore = model.MinFormatScore,
+                CutoffFormatScore = model.CutoffFormatScore,
+                FormatItems = model.FormatItems.ConvertAll(ToResource)
             };
         }
 
@@ -62,6 +77,16 @@ namespace Sonarr.Api.V3.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 Sonarr.Api.V3.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 Sonarr.Api.V3.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/Sonarr.Api.V3/Profiles/Release/ReleaseProfileController.cs b/src/Sonarr.Api.V3/Profiles/Release/ReleaseProfileController.cs
index fd5ca9b57..d9ab258c0 100644
--- a/src/Sonarr.Api.V3/Profiles/Release/ReleaseProfileController.cs
+++ b/src/Sonarr.Api.V3/Profiles/Release/ReleaseProfileController.cs
@@ -24,20 +24,15 @@ namespace Sonarr.Api.V3.Profiles.Release
 
             SharedValidator.RuleFor(d => d).Custom((restriction, context) =>
             {
-                if (restriction.MapIgnored().Empty() && restriction.MapRequired().Empty() && restriction.Preferred.Empty())
+                if (restriction.MapIgnored().Empty() && restriction.MapRequired().Empty())
                 {
-                    context.AddFailure("'Must contain', 'Must not contain' or 'Preferred' is required");
+                    context.AddFailure("'Must contain' or 'Must not contain' is required");
                 }
 
                 if (restriction.Enabled && restriction.IndexerId != 0 && !_indexerFactory.Exists(restriction.IndexerId))
                 {
                     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/Sonarr.Api.V3/Profiles/Release/ReleaseProfileResource.cs b/src/Sonarr.Api.V3/Profiles/Release/ReleaseProfileResource.cs
index b6bd95a0d..8c3e3fb78 100644
--- a/src/Sonarr.Api.V3/Profiles/Release/ReleaseProfileResource.cs
+++ b/src/Sonarr.Api.V3/Profiles/Release/ReleaseProfileResource.cs
@@ -15,14 +15,11 @@ namespace Sonarr.Api.V3.Profiles.Release
         // Is List<string>, string or JArray, we accept 'string' with POST for backward compatibility
         public object Required { get; set; }
         public object Ignored { get; set; }
-        public List<KeyValuePair<string, int>> Preferred { get; set; }
-        public bool IncludePreferredWhenRenaming { get; set; }
         public int IndexerId { get; set; }
         public HashSet<int> Tags { get; set; }
 
         public ReleaseProfileResource()
         {
-            Preferred = new List<KeyValuePair<string, int>>();
             Tags = new HashSet<int>();
         }
     }
@@ -43,8 +40,6 @@ namespace Sonarr.Api.V3.Profiles.Release
                 Enabled = model.Enabled,
                 Required = model.Required ?? new List<string>(),
                 Ignored = model.Ignored ?? new List<string>(),
-                Preferred = model.Preferred,
-                IncludePreferredWhenRenaming = model.IncludePreferredWhenRenaming,
                 IndexerId = model.IndexerId,
                 Tags = new HashSet<int>(model.Tags)
             };
@@ -64,8 +59,6 @@ namespace Sonarr.Api.V3.Profiles.Release
                 Enabled = resource.Enabled,
                 Required = resource.MapRequired(),
                 Ignored = resource.MapIgnored(),
-                Preferred = resource.Preferred,
-                IncludePreferredWhenRenaming = resource.IncludePreferredWhenRenaming,
                 IndexerId = resource.IndexerId,
                 Tags = new HashSet<int>(resource.Tags)
             };
diff --git a/src/Sonarr.Api.V3/Queue/QueueResource.cs b/src/Sonarr.Api.V3/Queue/QueueResource.cs
index e7879fa88..6cfe30662 100644
--- a/src/Sonarr.Api.V3/Queue/QueueResource.cs
+++ b/src/Sonarr.Api.V3/Queue/QueueResource.cs
@@ -6,6 +6,7 @@ using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
+using Sonarr.Api.V3.CustomFormats;
 using Sonarr.Api.V3.Episodes;
 using Sonarr.Api.V3.Series;
 using Sonarr.Http.REST;
@@ -20,6 +21,7 @@ namespace Sonarr.Api.V3.Queue
         public EpisodeResource Episode { get; set; }
         public Language Language { 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; }
@@ -55,6 +57,7 @@ namespace Sonarr.Api.V3.Queue
                 Episode = includeEpisode && model.Episode != null ? model.Episode.ToResource() : null,
                 Language = model.Language,
                 Quality = model.Quality,
+                CustomFormats = model.RemoteEpisode?.CustomFormats?.ToResource(),
                 Size = model.Size,
                 Title = model.Title,
                 Sizeleft = model.Sizeleft,
diff --git a/src/Sonarr.Http/ClientSchema/Field.cs b/src/Sonarr.Http/ClientSchema/Field.cs
index 8fe3336ab..cdc2a9d33 100644
--- a/src/Sonarr.Http/ClientSchema/Field.cs
+++ b/src/Sonarr.Http/ClientSchema/Field.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using NzbDrone.Core.Annotations;
 
 namespace Sonarr.Http.ClientSchema
 {