refactor(everything): Scoring Refactor, 720p Fallback, Streaming Service Improvements

- Adjust scoring for each profile to better differentiate resolution and release type
- Add 720p Fallback
- Change streaming service names to match their regex targets
- Add Stan, BCORE streaming services
- Negate bleeding edge codecs (AV1, VVC)
- Reduce scene score
- Various tag/name improvements

profiles/1080p Balanced.yml

@@ -12,67 +12,78 @@ description: '1080p Balanced targets consistent & immutable 1080p **WEB-DLs** wi
   DVD remuxes  / encodes. '
 tags:
 - 1080p
-- x264
-- Lossy Audio
 - Balanced Focused
+- Lossy Audio
+- x264
+- h264
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 320
+minCustomFormatScore: 100
+upgradeUntilScore: 1000
 minScoreIncrement: 1
 custom_formats:
-- name: 1080p
-  score: 220
-- name: Disney+
-  score: 220
-- name: Movies Anywhere
-  score: 220
-- name: Amazon Prime
-  score: 210
-- name: Apple TV+
-  score: 210
-- name: Criterion Channel
-  score: 210
-- name: HBO Max
-  score: 210
-- name: Max
-  score: 210
-- name: Netflix
-  score: 210
-- name: Paramount+
-  score: 210
-- name: Peacock
-  score: 210
-- name: iTunes (Missing)
-  score: 200
 - name: 1080p Balanced Tier 1
-  score: 170
+  score: 830
 - name: 1080p Balanced Tier 2
+  score: 820
+- name: 1080p WEB-DL
+  score: 800
+- name: 720p WEB-DL
+  score: 500
+- name: 720p Bluray
+  score: 410
+- name: 720p WEBRip
+  score: 400
+- name: 480p WEB-DL
+  score: 200
+- name: 720p Quality Tier 1
+  score: 200
+- name: 720p Quality Tier 2
+  score: 190
+- name: 720p Quality Tier 3
+  score: 180
+- name: 720p Quality Tier 4
+  score: 170
+- name: 720p Quality Tier 5
   score: 160
-- name: 1080p Quality Tier 1
-  score: 90
-- name: Hulu
-  score: 90
-- name: iTunes
-  score: 90
-- name: Roku
-  score: 90
-- name: 1080p Quality Tier 2
-  score: 80
-- name: 1080p Quality Tier 3
-  score: 70
-- name: 1080p Golden Popcorn
-  score: 60
-- name: 1080p Quality Tier 4
-  score: 60
-- name: 1080p Quality Tier 5
-  score: 50
 - name: DVD Remux
+  score: 130
+- name: DVD
+  score: 120
+- name: 480p WEBRip
+  score: 100
+- name: 720p Golden Popcorn
+  score: 60
+- name: MA
+  score: 50
+- name: AMZN
+  score: 40
+- name: ATVP
+  score: 40
+- name: DSNP
   score: 40
 - name: SD Golden Popcorn
+  score: 40
+- name: CRIT
+  score: 30
+- name: HMAX
+  score: 30
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
   score: 30
 - name: SD Quality Tier 1
   score: 30
-- name: Scene
+- name: STAN
+  score: 30
+- name: HULU
+  score: 20
+- name: iT
+  score: 20
+- name: ROKU
   score: 20
 - name: SD Quality Tier 2
   score: 20
@@ -80,34 +91,22 @@ custom_formats:
   score: 10
 - name: Atmos (Missing)
   score: 10
-- name: Blu-ray
-  score: 10
 - name: Special Edition
   score: 10
-- name: WEBRip
-  score: 10
-- name: x264
-  score: 10
 - name: Repack3
   score: 8
 - name: Repack2
   score: 7
 - name: Repack1
   score: 6
-- name: 2160p
-  score: -9999
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
-- name: 720p Golden Popcorn
+- name: AV1
   score: -9999
 - name: B&W
   score: -9999
 - name: BeyondHD
   score: -9999
-- name: Blu-ray Remux
-  score: -9999
 - name: Dolby Vision
   score: -9999
 - name: Extras
@@ -128,56 +127,51 @@ custom_formats:
   score: -9999
 - name: Remux
   score: -9999
-- name: SD Bluray Encodes
+- name: Remux (Quality Match)
   score: -9999
 - name: Upscaled
   score: -9999
+- name: VVC
+  score: -9999
 - name: x265
   score: -9999
 - name: x265 (Missing)
   score: -9999
 qualities:
 - id: -1
-  name: Balanced capable
-  description: Balanced capable releases. Typically WEB-DL would be the overwhelming
+  name: Balanced Capable
+  description: Balanced Capable releases. Typically WEB-DL would be the overwhelming
     majority of releases, but there are occasional streaming optimised encodes that
     should be preferred.
   qualities:
   - id: 10
     name: Bluray-1080p
-  - id: 11
-    name: WEBRip-1080p
   - id: 9
     name: WEBDL-1080p
 - id: -2
-  name: SD
-  description: SD Fallbacks
+  name: 720p Fallback
+  description: Fallback to 720p when 1080p cannot be found.
   qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -3
+  name: SD Fallback
+  description: Standard Definition Fallbacks
+  qualities:
+  - id: 22
+    name: DVD
   - id: 19
     name: WEBDL-480p
   - id: 20
     name: WEBRip-480p
-  - id: 22
-    name: DVD
-  - id: 24
-    name: SDTV
-- id: -3
-  name: Prereleases
-  description: 'Low quality releases that come out before physical discs / streaming
-    / VODs. Needs to be enabled for tweak to work. '
-  qualities:
-  - id: 29
-    name: CAM
-  - id: 26
-    name: Telesync
-  - id: 25
-    name: Telecine
-  - id: 23
-    name: DVDSCR
 upgrade_until:
   id: -1
-  name: Balanced capable
-  description: Balanced capable releases. Typically WEB-DL would be the overwhelming
+  name: Balanced Capable
+  description: Balanced Capable releases. Typically WEB-DL would be the overwhelming
     majority of releases, but there are occasional streaming optimised encodes that
     should be preferred.
 language: must_original

profiles/1080p Quality (HDR).yml

@@ -9,77 +9,103 @@ description: "1080p Quality (HDR) utilizes the [**Golden Popcorn Performance Ind
   \ will fall back to SD releases - **DVD remuxes  / encodes**"
 tags:
 - 1080p
-- x264
-- x265
+- Quality Focused
 - HDR
 - Lossy Audio
-- Quality Focused
+- x264
+- x265
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 320
+minCustomFormatScore: 100
+upgradeUntilScore: 1400
 minScoreIncrement: 1
 custom_formats:
 - name: UHD Bluray
-  score: 350
+  score: 1200
 - name: UHD Bluray (Missing)
-  score: 350
-- name: 1080p Golden Popcorn
-  score: 120
+  score: 1200
+- name: 1080p WEB-DL
+  score: 900
+- name: 1080p Bluray
+  score: 710
+- name: 1080p WEBRip
+  score: 700
+- name: 720p WEB-DL
+  score: 500
+- name: 720p Bluray
+  score: 410
+- name: 720p WEBRip
+  score: 400
 - name: 1080p Quality Tier 1
-  score: 120
+  score: 300
 - name: 1080p Quality Tier 2
-  score: 110
+  score: 290
 - name: 1080p Quality Tier 3
-  score: 100
+  score: 280
 - name: 1080p Quality Tier 4
-  score: 90
+  score: 270
 - name: 1080p Quality Tier 5
-  score: 80
-- name: 1080p
-  score: 60
-- name: Amazon Prime
-  score: 60
-- name: Apple TV+
-  score: 60
-- name: Disney+
-  score: 60
-- name: Movies Anywhere
-  score: 60
+  score: 260
 - name: 1080p Balanced Tier 1
-  score: 50
-- name: Criterion Channel
-  score: 50
-- name: HBO Max
-  score: 50
-- name: Max
-  score: 50
-- name: Netflix
-  score: 50
-- name: Paramount+
-  score: 50
-- name: Peacock
-  score: 50
+  score: 220
 - name: 1080p Balanced Tier 2
-  score: 40
+  score: 210
+- name: 480p WEB-DL
+  score: 200
+- name: 720p Quality Tier 1
+  score: 200
+- name: 720p Quality Tier 2
+  score: 190
+- name: 720p Quality Tier 3
+  score: 180
+- name: 720p Quality Tier 4
+  score: 170
+- name: 720p Quality Tier 5
+  score: 160
 - name: DVD Remux
+  score: 130
+- name: DVD
+  score: 120
+- name: 480p WEBRip
+  score: 100
+- name: 1080p Golden Popcorn
+  score: 80
+- name: 720p Golden Popcorn
+  score: 60
+- name: MA
+  score: 50
+- name: AMZN
   score: 40
-- name: Hulu
+- name: ATVP
   score: 40
-- name: iTunes
+- name: DSNP
   score: 40
-- name: iTunes (Missing)
-  score: 40
-- name: Roku
+- name: SD Golden Popcorn
   score: 40
+- name: CRIT
+  score: 30
 - name: Dolby Vision
   score: 30
-- name: SD Golden Popcorn
+- name: HMAX
+  score: 30
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
   score: 30
 - name: SD Quality Tier 1
   score: 30
+- name: STAN
+  score: 30
 - name: HDR10+
   score: 20
-- name: Scene
+- name: HULU
+  score: 20
+- name: iT
+  score: 20
+- name: ROKU
   score: 20
 - name: SD Quality Tier 2
   score: 20
@@ -87,8 +113,6 @@ custom_formats:
   score: 10
 - name: Atmos (Missing)
   score: 10
-- name: Blu-ray
-  score: 10
 - name: HDR10
   score: 10
 - name: HDR10 (Missing)
@@ -97,10 +121,6 @@ custom_formats:
   score: 10
 - name: Special Edition
   score: 10
-- name: WEBRip
-  score: 10
-- name: x264
-  score: 10
 - name: Repack3
   score: 8
 - name: Repack2
@@ -108,21 +128,17 @@ custom_formats:
 - name: Repack1
   score: 6
 - name: x265
-  score: -90
+  score: -1000
 - name: 2160p
   score: -9999
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
-- name: 720p Golden Popcorn
+- name: AV1
   score: -9999
 - name: B&W
   score: -9999
 - name: BeyondHD
   score: -9999
-- name: Blu-ray Remux
-  score: -9999
 - name: Dolby Vision (Without Fallback)
   score: -9999
 - name: Extras
@@ -137,17 +153,19 @@ custom_formats:
   score: -9999
 - name: Remux
   score: -9999
-- name: SD Bluray Encodes
+- name: Remux (Quality Match)
   score: -9999
 - name: Unwanted x265 Groups
   score: -9999
 - name: Upscaled
   score: -9999
+- name: VVC
+  score: -9999
 - name: x265 (Missing)
   score: -9999
 qualities:
 - id: -1
-  name: Transparent capable
+  name: Transparent Capable
   description: All capable of being indistinguishable from source. WEB-DL included
     to not allow unknown encode to trump known WEB-DL.
   qualities:
@@ -158,20 +176,28 @@ qualities:
   - id: 11
     name: WEBRip-1080p
 - id: -2
-  name: SD
-  description: SD Fallbacks
+  name: 720p Fallback
+  description: Fallback to 720p when 1080p cannot be found.
   qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -3
+  name: SD Fallback
+  description: Standard Definition Fallbacks
+  qualities:
+  - id: 22
+    name: DVD
   - id: 19
     name: WEBDL-480p
   - id: 20
     name: WEBRip-480p
-  - id: 22
-    name: DVD
-  - id: 24
-    name: SDTV
 upgrade_until:
   id: -1
-  name: Transparent capable
+  name: Transparent Capable
   description: All capable of being indistinguishable from source. WEB-DL included
     to not allow unknown encode to trump known WEB-DL.
 language: must_original

profiles/1080p Quality.yml

@@ -6,102 +6,117 @@ description: "1080p Quality utilizes the [**Golden Popcorn Performance Index**](
   \ will fall back to SD releases - **DVD remuxes  / encodes**"
 tags:
 - 1080p
-- x264
-- Lossy Audio
 - Quality Focused
+- Lossy Audio
+- x264
+- h264
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 320
+minCustomFormatScore: 100
+upgradeUntilScore: 1200
 minScoreIncrement: 1
 custom_formats:
-- name: 1080p Golden Popcorn
-  score: 160
+- name: 1080p WEB-DL
+  score: 900
+- name: 1080p Bluray
+  score: 710
+- name: 1080p WEBRip
+  score: 700
+- name: 720p WEB-DL
+  score: 500
+- name: 720p Bluray
+  score: 410
+- name: 720p WEBRip
+  score: 400
 - name: 1080p Quality Tier 1
-  score: 80
+  score: 300
 - name: 1080p Quality Tier 2
-  score: 70
-- name: 1080p
-  score: 60
+  score: 290
 - name: 1080p Quality Tier 3
-  score: 60
+  score: 280
 - name: 1080p Quality Tier 4
-  score: 50
+  score: 270
 - name: 1080p Quality Tier 5
-  score: 40
-- name: Amazon Prime
-  score: 40
-- name: Apple TV+
-  score: 40
-- name: Disney+
-  score: 40
+  score: 260
+- name: 1080p Balanced Tier 1
+  score: 220
+- name: 1080p Balanced Tier 2
+  score: 210
+- name: 480p WEB-DL
+  score: 200
+- name: 720p Quality Tier 1
+  score: 200
+- name: 720p Quality Tier 2
+  score: 190
+- name: 720p Quality Tier 3
+  score: 180
+- name: 720p Quality Tier 4
+  score: 170
+- name: 720p Quality Tier 5
+  score: 160
 - name: DVD Remux
+  score: 130
+- name: DVD
+  score: 120
+- name: 480p WEBRip
+  score: 100
+- name: 1080p Golden Popcorn
+  score: 80
+- name: 720p Golden Popcorn
+  score: 60
+- name: MA
+  score: 50
+- name: AMZN
   score: 40
-- name: Movies Anywhere
+- name: ATVP
+  score: 40
+- name: DSNP
   score: 40
-- name: Criterion Channel
-  score: 30
-- name: HBO Max
-  score: 30
-- name: Max
-  score: 30
-- name: Netflix
-  score: 30
-- name: Paramount+
-  score: 30
-- name: Peacock
-  score: 30
 - name: SD Golden Popcorn
+  score: 40
+- name: CRIT
+  score: 30
+- name: HMAX
+  score: 30
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
   score: 30
 - name: SD Quality Tier 1
   score: 30
-- name: Hulu
+- name: STAN
+  score: 30
+- name: HULU
   score: 20
-- name: iTunes
+- name: iT
   score: 20
-- name: iTunes (Missing)
-  score: 20
-- name: Roku
-  score: 20
-- name: Scene
+- name: ROKU
   score: 20
 - name: SD Quality Tier 2
   score: 20
-- name: 1080p Balanced Tier 1
-  score: 10
-- name: 1080p Balanced Tier 2
-  score: 10
 - name: Atmos
   score: 10
 - name: Atmos (Missing)
   score: 10
-- name: Blu-ray
-  score: 10
 - name: Special Edition
   score: 10
-- name: WEBRip
-  score: 10
-- name: x264
-  score: 10
 - name: Repack3
   score: 8
 - name: Repack2
   score: 7
 - name: Repack1
   score: 6
-- name: 2160p
-  score: -9999
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
-- name: 720p Golden Popcorn
+- name: AV1
   score: -9999
 - name: B&W
   score: -9999
 - name: BeyondHD
   score: -9999
-- name: Blu-ray Remux
-  score: -9999
 - name: Dolby Vision
   score: -9999
 - name: Extras
@@ -122,17 +137,19 @@ custom_formats:
   score: -9999
 - name: Remux
   score: -9999
-- name: SD Bluray Encodes
+- name: Remux (Quality Match)
   score: -9999
 - name: Upscaled
   score: -9999
+- name: VVC
+  score: -9999
 - name: x265
   score: -9999
 - name: x265 (Missing)
   score: -9999
 qualities:
 - id: -1
-  name: Transparent capable
+  name: Transparent Capable
   description: All capable of being indistinguishable from source. WEB-DL included
     to not allow unknown encode to trump known WEB-DL.
   qualities:
@@ -143,20 +160,28 @@ qualities:
   - id: 11
     name: WEBRip-1080p
 - id: -2
-  name: SD
-  description: SD Fallbacks
+  name: 720p Fallback
+  description: Fallback to 720p when 1080p cannot be found.
   qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -3
+  name: SD Fallback
+  description: Standard Definition Fallbacks
+  qualities:
+  - id: 22
+    name: DVD
   - id: 19
     name: WEBDL-480p
   - id: 20
     name: WEBRip-480p
-  - id: 22
-    name: DVD
-  - id: 24
-    name: SDTV
 upgrade_until:
   id: -1
-  name: Transparent capable
+  name: Transparent Capable
   description: All capable of being indistinguishable from source. WEB-DL included
     to not allow unknown encode to trump known WEB-DL.
 language: must_original

profiles/1080p Remux.yml

@@ -14,60 +14,64 @@ tags:
 - Lossless Audio
 - h264
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 350
+minCustomFormatScore: 100
+upgradeUntilScore: 1000
 minScoreIncrement: 1
 custom_formats:
-- name: 1080p
-  score: 60
-- name: Blu-ray Remux
-  score: 60
+- name: 1080p Remux
+  score: 800
+- name: 1080p WEB-DL
+  score: 600
+- name: 720p WEB-DL
+  score: 400
+- name: 480p WEB-DL
+  score: 200
+- name: DVD Remux
+  score: 200
+- name: DVD
+  score: 100
 - name: DTS-X
   score: 60
-- name: Remux
-  score: 60
 - name: DTS-HD MA
   score: 50
+- name: MA
+  score: 50
 - name: TrueHD
   score: 50
 - name: TrueHD (Missing)
   score: 50
-- name: DVD Remux
+- name: AMZN
   score: 40
-- name: Amazon Prime
-  score: 30
-- name: Apple TV+
-  score: 30
-- name: Disney+
+- name: ATVP
+  score: 40
+- name: DSNP
+  score: 40
+- name: CRIT
   score: 30
 - name: FLAC
   score: 30
-- name: Movies Anywhere
+- name: HMAX
   score: 30
-- name: Criterion Channel
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
+  score: 30
+- name: STAN
+  score: 30
+- name: HULU
   score: 20
-- name: HBO Max
+- name: iT
   score: 20
-- name: Max
-  score: 20
-- name: Netflix
-  score: 20
-- name: Paramount+
-  score: 20
-- name: Peacock
+- name: ROKU
   score: 20
 - name: Atmos
   score: 10
 - name: Atmos (Missing)
   score: 10
-- name: Hulu
-  score: 10
-- name: iTunes
-  score: 10
-- name: iTunes (Missing)
-  score: 10
-- name: Roku
-  score: 10
 - name: Special Edition
   score: 10
 - name: Repack3
@@ -78,18 +82,12 @@ custom_formats:
   score: 6
 - name: Unknown Lossless Audio
   score: 5
-- name: 2160p
-  score: -9999
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
 - name: AV1
   score: -9999
 - name: B&W
   score: -9999
-- name: Blu-ray
-  score: -9999
 - name: Dolby Vision
   score: -9999
 - name: Dolby Vision (Without Fallback)
@@ -120,8 +118,6 @@ custom_formats:
   score: -9999
 - name: VVC
   score: -9999
-- name: WEBRip
-  score: -9999
 - name: x264
   score: -9999
 - name: x265
@@ -131,18 +127,16 @@ qualities:
   name: Remux-1080p
 - id: 9
   name: WEBDL-1080p
+- id: 14
+  name: WEBDL-720p
 - id: -1
-  name: SD
+  name: SD Fallback
   description: Standard Definition Fallbacks
   qualities:
   - id: 22
     name: DVD
   - id: 19
     name: WEBDL-480p
-  - id: 20
-    name: WEBRip-480p
-  - id: 24
-    name: SDTV
 upgrade_until:
   id: 8
   name: Remux-1080p

profiles/2160p Balanced.yml

@@ -8,114 +8,114 @@ description: "2160p Balanced targets consistent & immutable 2160p **HDR WEB-DLs
   \ as fallback since they are comparatively much larger than 2160p WEB-DLs"
 tags:
 - 2160p
+- Balanced Focused
 - HDR
+- Lossy Audio
 - x264
 - h265
-- Lossy Audio
-- Balanced Focused
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 600
+minCustomFormatScore: 100
+upgradeUntilScore: 1400
 minScoreIncrement: 1
 custom_formats:
-- name: 2160p
-  score: 300
 - name: 2160p Balanced Tier 1
-  score: 250
+  score: 1230
 - name: 2160p Balanced Tier 2
-  score: 240
-- name: Amazon Prime [2160p]
-  score: 160
-- name: Disney+ [2160p]
-  score: 160
-- name: HBO Max [2160p]
-  score: 160
-- name: Movies Anywhere [2160p]
-  score: 160
-- name: Apple TV+ [2160p]
-  score: 150
-- name: Hulu [2160p]
-  score: 150
-- name: iTunes [2160p]
-  score: 150
-- name: Max [2160p]
-  score: 150
-- name: Netflix [2160p]
-  score: 150
-- name: Paramount+ [2160p]
-  score: 150
-- name: Peacock [2160p]
-  score: 150
-- name: Roku [2160p]
-  score: 150
-- name: 1080p
-  score: 60
+  score: 1220
+- name: 2160p WEB-DL
+  score: 1200
+- name: 1080p WEB-DL
+  score: 900
+- name: 1080p Bluray
+  score: 710
+- name: 1080p WEBRip
+  score: 700
+- name: 720p WEB-DL
+  score: 500
+- name: 720p Bluray
+  score: 410
+- name: 720p WEBRip
+  score: 400
 - name: 1080p Quality Tier 1
-  score: 60
+  score: 300
 - name: 1080p Quality Tier 2
-  score: 50
-- name: Special Edition
-  score: 50
+  score: 290
 - name: 1080p Quality Tier 3
-  score: 40
-- name: DVD Remux
-  score: 40
+  score: 280
 - name: 1080p Quality Tier 4
+  score: 270
+- name: 1080p Quality Tier 5
+  score: 260
+- name: 1080p Balanced Tier 1
+  score: 220
+- name: 1080p Balanced Tier 2
+  score: 210
+- name: 480p WEB-DL
+  score: 200
+- name: 720p Quality Tier 1
+  score: 200
+- name: 720p Quality Tier 2
+  score: 190
+- name: 720p Quality Tier 3
+  score: 180
+- name: 720p Quality Tier 4
+  score: 170
+- name: 720p Quality Tier 5
+  score: 160
+- name: DVD Remux
+  score: 130
+- name: DVD
+  score: 120
+- name: 480p WEBRip
+  score: 100
+- name: MA
+  score: 50
+- name: AMZN
+  score: 40
+- name: DSNP
+  score: 40
+- name: HMAX
+  score: 40
+- name: ATVP
   score: 30
-- name: Amazon Prime [1080p]
-  score: 30
-- name: Apple TV+ [1080p]
-  score: 30
-- name: Disney+ [1080p]
+- name: CRIT
   score: 30
 - name: Dolby Vision
   score: 30
-- name: Movies Anywhere [1080p]
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
   score: 30
 - name: SD Quality Tier 1
   score: 30
-- name: 1080p Balanced Tier 1
-  score: 20
-- name: 1080p Quality Tier 5
-  score: 20
-- name: HBO Max [1080p]
-  score: 20
+- name: STAN
+  score: 30
 - name: HDR10+
   score: 20
-- name: Max [1080p]
+- name: HULU
   score: 20
-- name: Netflix [1080p]
+- name: iT
+  score: 20
+- name: ROKU
   score: 20
 - name: SD Quality Tier 2
   score: 20
 - name: DTS-X
   score: 15
-- name: 1080p Balanced Tier 2
-  score: 10
-- name: Blu-ray
-  score: 10
 - name: HDR10
   score: 10
 - name: HDR10 (Missing)
   score: 10
-- name: Hulu [1080p]
-  score: 10
-- name: iTunes [1080p]
-  score: 10
-- name: Paramount+ [1080p]
-  score: 10
-- name: Peacock [1080p]
-  score: 10
-- name: Roku [1080p]
+- name: Special Edition
   score: 10
 - name: TrueHD
   score: 10
 - name: TrueHD (Missing)
   score: 10
-- name: WEBRip
-  score: 10
-- name: x264
-  score: 10
 - name: Repack3
   score: 8
 - name: Repack2
@@ -132,46 +132,12 @@ custom_formats:
   score: 5
 - name: Unknown Lossless Audio
   score: 5
-- name: Amazon Prime
-  score: 0
-- name: Apple TV+
-  score: 0
-- name: Criterion Channel
-  score: 0
-- name: Disney+
-  score: 0
-- name: HBO Max
-  score: 0
-- name: Hulu
-  score: 0
-- name: iTunes
-  score: 0
-- name: Max
-  score: 0
-- name: Movies Anywhere
-  score: 0
-- name: Netflix
-  score: 0
-- name: Paramount+
-  score: 0
-- name: Peacock
-  score: 0
-- name: Roku
-  score: 0
-- name: SDR
-  score: -80
-- name: 2160p Blu-ray Encode
-  score: -9999
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
 - name: AV1
   score: -9999
 - name: B&W
   score: -9999
-- name: Blu-ray Remux
-  score: -9999
 - name: Dolby Vision (Without Fallback)
   score: -9999
 - name: Extras
@@ -192,7 +158,7 @@ custom_formats:
   score: -9999
 - name: Remux
   score: -9999
-- name: SD Bluray Encodes
+- name: Remux (Quality Match)
   score: -9999
 - name: UHDBits
   score: -9999
@@ -213,20 +179,38 @@ custom_formats:
 - name: x265 (Missing)
   score: -9999
 qualities:
-- id: 5
-  name: WEBDL-2160p
-- id: -3
+- id: -1
+  name: 2160p Balanced
+  description: Balanced capable releases. Typically WEB-DL would be the overwhelming
+    majority of releases, but there are occasional streaming optimised encodes that
+    should be preferred.
+  qualities:
+  - id: 4
+    name: Bluray-2160p
+  - id: 5
+    name: WEBDL-2160p
+- id: -2
   name: 1080p Transparent
   description: Indistinguishable from source
   qualities:
   - id: 10
     name: Bluray-1080p
-  - id: 11
-    name: WEBRip-1080p
   - id: 9
     name: WEBDL-1080p
-- id: -1
-  name: SD
+  - id: 11
+    name: WEBRip-1080p
+- id: -3
+  name: 720p Fallback
+  description: Fallback to 720p when 1080p cannot be found.
+  qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -4
+  name: SD Fallback
   description: Standard Definition Fallbacks
   qualities:
   - id: 22
@@ -235,10 +219,10 @@ qualities:
     name: WEBDL-480p
   - id: 20
     name: WEBRip-480p
-  - id: 24
-    name: SDTV
 upgrade_until:
-  id: 5
-  name: WEBDL-2160p
-  description: 4K web download, untouched as released by the streaming service
+  id: -1
+  name: 2160p Balanced
+  description: Balanced capable releases. Typically WEB-DL would be the overwhelming
+    majority of releases, but there are occasional streaming optimised encodes that
+    should be preferred.
 language: must_original

profiles/2160p Quality.yml

@@ -9,126 +9,128 @@ description: "2160p Quality utilizes the [**Encode Efficiency Index**](https://d
   \ will fall back to the 1080p Quality Profile. "
 tags:
 - 2160p
-- HDR
-- x265
-- Encode
-- Lossless Audio
 - Quality Focused
+- HDR
+- Lossless Audio
+- x265
+- h265
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 600
+minCustomFormatScore: 100
+upgradeUntilScore: 1600
 minScoreIncrement: 1
 custom_formats:
+- name: 2160p WEB-DL
+  score: 1400
+- name: 2160p Bluray
+  score: 1100
+- name: 1080p WEB-DL
+  score: 900
+- name: 1080p Bluray
+  score: 710
+- name: 1080p WEBRip
+  score: 700
+- name: 720p WEB-DL
+  score: 500
 - name: 2160p Quality Tier 1
-  score: 370
+  score: 410
+- name: 720p Bluray
+  score: 410
 - name: 2160p Quality Tier 2
-  score: 360
+  score: 400
+- name: 720p WEBRip
+  score: 400
 - name: 2160p Quality Tier 3
-  score: 350
+  score: 390
 - name: 2160p Quality Tier 4
-  score: 340
-- name: 2160p
-  score: 300
-- name: 2160p Balanced Tier 1
-  score: 300
-- name: 2160p Balanced Tier 2
-  score: 290
+  score: 380
 - name: 2160p Quality Tier 5
-  score: 240
+  score: 370
 - name: 2160p Quality Tier 6
-  score: 230
-- name: Amazon Prime [2160p]
-  score: 160
-- name: Disney+ [2160p]
-  score: 160
-- name: HBO Max [2160p]
-  score: 160
-- name: Movies Anywhere [2160p]
-  score: 160
-- name: Apple TV+ [2160p]
-  score: 150
-- name: Hulu [2160p]
-  score: 150
-- name: iTunes [2160p]
-  score: 150
-- name: Max [2160p]
-  score: 150
-- name: Netflix [2160p]
-  score: 150
-- name: Paramount+ [2160p]
-  score: 150
-- name: Peacock [2160p]
-  score: 150
-- name: Roku [2160p]
-  score: 150
-- name: 1080p
-  score: 60
+  score: 360
+- name: 2160p Balanced Tier 1
+  score: 330
+- name: 2160p Balanced Tier 2
+  score: 320
 - name: 1080p Quality Tier 1
-  score: 60
+  score: 300
 - name: 1080p Quality Tier 2
-  score: 50
-- name: Special Edition
-  score: 50
+  score: 290
 - name: 1080p Quality Tier 3
-  score: 40
-- name: DVD Remux
-  score: 40
+  score: 280
 - name: 1080p Quality Tier 4
+  score: 270
+- name: 1080p Quality Tier 5
+  score: 260
+- name: 1080p Balanced Tier 1
+  score: 220
+- name: 1080p Balanced Tier 2
+  score: 210
+- name: 480p WEB-DL
+  score: 200
+- name: 720p Quality Tier 1
+  score: 200
+- name: 720p Quality Tier 2
+  score: 190
+- name: 720p Quality Tier 3
+  score: 180
+- name: 720p Quality Tier 4
+  score: 170
+- name: 720p Quality Tier 5
+  score: 160
+- name: DVD Remux
+  score: 130
+- name: DVD
+  score: 120
+- name: 480p WEBRip
+  score: 100
+- name: MA
+  score: 50
+- name: AMZN
+  score: 40
+- name: DSNP
+  score: 40
+- name: HMAX
+  score: 40
+- name: ATVP
   score: 30
-- name: Amazon Prime [1080p]
-  score: 30
-- name: Apple TV+ [1080p]
-  score: 30
-- name: Disney+ [1080p]
+- name: CRIT
   score: 30
 - name: Dolby Vision
   score: 30
-- name: Movies Anywhere [1080p]
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
   score: 30
 - name: SD Quality Tier 1
   score: 30
-- name: 1080p Balanced Tier 1
-  score: 20
-- name: 1080p Quality Tier 5
-  score: 20
-- name: HBO Max [1080p]
-  score: 20
+- name: STAN
+  score: 30
 - name: HDR10+
   score: 20
-- name: Max [1080p]
+- name: HULU
   score: 20
-- name: Netflix [1080p]
+- name: iT
+  score: 20
+- name: ROKU
   score: 20
 - name: SD Quality Tier 2
   score: 20
 - name: DTS-X
   score: 15
-- name: 1080p Balanced Tier 2
-  score: 10
-- name: Blu-ray
-  score: 10
 - name: HDR10
   score: 10
 - name: HDR10 (Missing)
   score: 10
-- name: Hulu [1080p]
-  score: 10
-- name: iTunes [1080p]
-  score: 10
-- name: Paramount+ [1080p]
-  score: 10
-- name: Peacock [1080p]
-  score: 10
-- name: Roku [1080p]
+- name: Special Edition
   score: 10
 - name: TrueHD
   score: 10
 - name: TrueHD (Missing)
   score: 10
-- name: WEBRip
-  score: 10
-- name: x264
-  score: 10
 - name: Repack3
   score: 8
 - name: Repack2
@@ -145,48 +147,12 @@ custom_formats:
   score: 5
 - name: Unknown Lossless Audio
   score: 5
-- name: Amazon Prime
-  score: 0
-- name: Apple TV+
-  score: 0
-- name: Criterion Channel
-  score: 0
-- name: Disney+
-  score: 0
-- name: HBO Max
-  score: 0
-- name: Hulu
-  score: 0
-- name: iTunes
-  score: 0
-- name: Max
-  score: 0
-- name: Movies Anywhere
-  score: 0
-- name: Netflix
-  score: 0
-- name: Paramount+
-  score: 0
-- name: Peacock
-  score: 0
-- name: Roku
-  score: 0
-- name: SDR
-  score: -80
-- name: x265
-  score: -150
-- name: x265 (Missing 2160p)
-  score: -150
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
 - name: AV1
   score: -9999
 - name: B&W
   score: -9999
-- name: Blu-ray Remux
-  score: -9999
 - name: Dolby Vision (Without Fallback)
   score: -9999
 - name: Extras
@@ -207,7 +173,7 @@ custom_formats:
   score: -9999
 - name: Remux
   score: -9999
-- name: SD Bluray Encodes
+- name: Remux (Quality Match)
   score: -9999
 - name: UHDBits
   score: -9999
@@ -224,26 +190,36 @@ custom_formats:
 - name: x265 (Missing)
   score: -9999
 qualities:
-- id: -2
+- id: -1
   name: 2160p Transparent
   description: Indistinguishable from source
   qualities:
-  - id: 5
-    name: WEBDL-2160p
   - id: 4
     name: Bluray-2160p
-- id: -3
+  - id: 5
+    name: WEBDL-2160p
+- id: -2
   name: 1080p Transparent
   description: Indistinguishable from source
   qualities:
   - id: 10
     name: Bluray-1080p
-  - id: 11
-    name: WEBRip-1080p
   - id: 9
     name: WEBDL-1080p
-- id: -1
-  name: SD
+  - id: 11
+    name: WEBRip-1080p
+- id: -3
+  name: 720p Fallback
+  description: Fallback to 720p when 1080p cannot be found.
+  qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -4
+  name: SD Fallback
   description: Standard Definition Fallbacks
   qualities:
   - id: 22
@@ -252,10 +228,8 @@ qualities:
     name: WEBDL-480p
   - id: 20
     name: WEBRip-480p
-  - id: 24
-    name: SDTV
 upgrade_until:
-  id: -2
+  id: -1
   name: 2160p Transparent
   description: Indistinguishable from source
 language: must_original

profiles/2160p Remux.yml

@@ -18,55 +18,67 @@ tags:
 - Lossless Audio
 - h265
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 350
+minCustomFormatScore: 100
+upgradeUntilScore: 1400
 minScoreIncrement: 1
 custom_formats:
-- name: 2160p
-  score: 120
-- name: 1080p
-  score: 60
-- name: Blu-ray Remux
-  score: 60
+- name: 2160p Remux
+  score: 1200
+- name: 2160p WEB-DL
+  score: 1000
+- name: 1080p Remux
+  score: 800
+- name: 1080p WEB-DL
+  score: 600
+- name: 720p WEB-DL
+  score: 400
+- name: 480p WEB-DL
+  score: 200
+- name: DVD Remux
+  score: 200
+- name: DVD
+  score: 100
 - name: DTS-X
   score: 60
-- name: Remux
-  score: 60
 - name: DTS-HD MA
   score: 50
-- name: Special Edition
+- name: MA
   score: 50
 - name: TrueHD
   score: 50
 - name: TrueHD (Missing)
   score: 50
-- name: DVD Remux
+- name: AMZN
   score: 40
-- name: Amazon Prime
+- name: DSNP
+  score: 40
+- name: HMAX
+  score: 40
+- name: ATVP
   score: 30
-- name: Apple TV+
-  score: 30
-- name: Disney+
+- name: CRIT
   score: 30
 - name: Dolby Vision
   score: 30
 - name: FLAC
   score: 30
-- name: Movies Anywhere
+- name: MAX
+  score: 30
+- name: NF
+  score: 30
+- name: PCOK
+  score: 30
+- name: PMTP
+  score: 30
+- name: STAN
   score: 30
-- name: Criterion Channel
-  score: 20
-- name: HBO Max
-  score: 20
 - name: HDR10+
   score: 20
-- name: Max
+- name: HULU
   score: 20
-- name: Netflix
+- name: iT
   score: 20
-- name: Paramount+
-  score: 20
-- name: Peacock
+- name: ROKU
   score: 20
 - name: Atmos
   score: 10
@@ -76,13 +88,7 @@ custom_formats:
   score: 10
 - name: HDR10 (Missing)
   score: 10
-- name: Hulu
-  score: 10
-- name: iTunes
-  score: 10
-- name: iTunes (Missing)
-  score: 10
-- name: Roku
+- name: Special Edition
   score: 10
 - name: Repack3
   score: 8
@@ -94,14 +100,10 @@ custom_formats:
   score: 5
 - name: 3D
   score: -9999
-- name: 720p
-  score: -9999
 - name: AV1
   score: -9999
 - name: B&W
   score: -9999
-- name: Blu-ray
-  score: -9999
 - name: Dolby Vision (Without Fallback)
   score: -9999
 - name: Extras
@@ -124,8 +126,6 @@ custom_formats:
   score: -9999
 - name: VVC
   score: -9999
-- name: WEBRip
-  score: -9999
 - name: x264
   score: -9999
 - name: x265
@@ -139,18 +139,16 @@ qualities:
   name: Remux-1080p
 - id: 9
   name: WEBDL-1080p
+- id: 14
+  name: WEBDL-720p
 - id: -1
-  name: SD
+  name: SD Fallback
   description: Standard Definition Fallbacks
   qualities:
   - id: 22
     name: DVD
   - id: 19
     name: WEBDL-480p
-  - id: 20
-    name: WEBRip-480p
-  - id: 24
-    name: SDTV
 upgrade_until:
   id: 3
   name: Remux-2160p