diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml
index b23ea75..7e1ffeb 100644
--- a/profiles/2160p Balanced.yml	
+++ b/profiles/2160p Balanced.yml	
@@ -18,100 +18,88 @@ minCustomFormatScore: 100
 upgradeUntilScore: 1400
 minScoreIncrement: 1
 custom_formats:
+- name: 2160p WEB-DL
+  score: 1200
 - name: 2160p Balanced Tier 1
-  score: 1110
+  score: 1120
 - name: 2160p Balanced Tier 2
-  score: 1100
-- name: 2160p WEBDL
-  score: 1020
+  score: 1110
+- name: 1080p WEB-DL
+  score: 900
 - name: 1080p Bluray
   score: 720
-- name: 1080p WEBDL
-  score: 710
 - name: 1080p WEBRip
   score: 700
+- name: 720p WEB-DL
+  score: 500
 - name: 720p Bluray
   score: 420
-- name: 720p WEBDL
-  score: 410
 - name: 720p WEBRip
   score: 400
-- name: Amazon Prime [2160p]
-  score: 200
-- name: Disney+ [2160p]
-  score: 200
-- name: HBO Max [2160p]
-  score: 200
-- name: Movies Anywhere [2160p]
-  score: 200
-- name: Apple TV+ [2160p]
-  score: 190
-- name: Hulu [2160p]
-  score: 190
-- name: iTunes [2160p]
-  score: 190
-- name: Max [2160p]
-  score: 190
-- name: Netflix [2160p]
-  score: 190
-- name: Paramount+ [2160p]
-  score: 190
-- name: Peacock [2160p]
-  score: 190
-- name: Roku [2160p]
-  score: 190
 - name: 1080p Quality Tier 1
-  score: 180
+  score: 280
 - name: 1080p Quality Tier 2
-  score: 170
+  score: 270
 - name: 1080p Quality Tier 3
-  score: 160
+  score: 260
 - name: 1080p Quality Tier 4
-  score: 150
+  score: 250
 - name: 1080p Quality Tier 5
+  score: 240
+- name: 480p WEB-DL
+  score: 200
+- name: 720p Quality Tier 1
+  score: 180
+- name: 720p Quality Tier 2
+  score: 170
+- name: 720p Quality Tier 3
+  score: 160
+- name: 720p Quality Tier 4
+  score: 150
+- name: 720p Quality Tier 5
   score: 140
-- name: Amazon Prime [1080p]
-  score: 120
-- name: Apple TV+ [1080p]
-  score: 120
-- name: Disney+ [1080p]
-  score: 120
+- name: DVD Remux
+  score: 130
 - name: DVD
   score: 120
-- name: Movies Anywhere [1080p]
-  score: 120
-- name: 480p WEBDL
-  score: 110
-- name: HBO Max [1080p]
-  score: 110
-- name: Max [1080p]
-  score: 110
-- name: Netflix [1080p]
-  score: 110
-- name: Paramount+ [1080p]
-  score: 110
-- name: Peacock [1080p]
-  score: 110
 - name: 1080p Balanced Tier 1
   score: 100
 - name: 480p WEBRip
   score: 100
-- name: Hulu [1080p]
-  score: 100
-- name: iTunes [1080p]
-  score: 100
-- name: Roku [1080p]
-  score: 100
 - name: 1080p Balanced Tier 2
   score: 90
-- name: DVD Remux
+- name: Amazon Prime
   score: 40
+- name: Disney+
+  score: 40
+- name: Movies Anywhere
+  score: 40
+- name: Apple TV+
+  score: 30
+- name: Criterion Channel
+  score: 30
 - name: Dolby Vision
   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 Quality Tier 1
   score: 30
 - name: HDR10+
   score: 20
+- name: Hulu
+  score: 20
+- name: iTunes
+  score: 20
+- name: Roku
+  score: 20
 - name: SD Quality Tier 2
   score: 20
 - name: DTS-X
diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml
index 6a2526b..4704dd7 100644
--- a/profiles/2160p Quality.yml	
+++ b/profiles/2160p Quality.yml	
@@ -15,105 +15,115 @@ tags:
 - Lossless Audio
 - Quality Focused
 upgradesAllowed: true
-minCustomFormatScore: 0
-upgradeUntilScore: 600
+minCustomFormatScore: 100
+upgradeUntilScore: 1400
 minScoreIncrement: 1
 custom_formats:
+- name: 2160p WEB-DL
+  score: 1400
+- name: 2160p Bluray
+  score: 1120
+- name: 1080p WEB-DL
+  score: 900
+- name: 1080p Bluray
+  score: 720
+- name: 1080p WEBRip
+  score: 700
+- name: 720p WEB-DL
+  score: 500
+- name: 720p Bluray
+  score: 420
+- name: 720p WEBRip
+  score: 400
 - name: 2160p Quality Tier 1
-  score: 370
+  score: 390
 - name: 2160p Quality Tier 2
-  score: 360
+  score: 380
 - name: 2160p Quality Tier 3
-  score: 350
+  score: 370
 - name: 2160p Quality Tier 4
+  score: 360
+- name: 2160p Quality Tier 5
+  score: 350
+- name: 2160p Quality Tier 6
   score: 340
 - name: 2160p Balanced Tier 1
   score: 300
 - name: 2160p Balanced Tier 2
   score: 290
-- name: 2160p Quality Tier 5
-  score: 240
-- 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 Quality Tier 1
-  score: 60
+  score: 280
 - name: 1080p Quality Tier 2
-  score: 50
-- name: Special Edition
-  score: 50
+  score: 270
 - name: 1080p Quality Tier 3
-  score: 40
-- name: DVD Remux
-  score: 40
+  score: 260
 - name: 1080p Quality Tier 4
+  score: 250
+- name: 1080p Quality Tier 5
+  score: 240
+- name: 1080p Balanced Tier 1
+  score: 200
+- name: 480p WEB-DL
+  score: 200
+- name: 1080p Balanced Tier 2
+  score: 190
+- name: 720p Quality Tier 1
+  score: 180
+- name: 720p Quality Tier 2
+  score: 170
+- name: 720p Quality Tier 3
+  score: 160
+- name: 720p Quality Tier 4
+  score: 150
+- name: 720p Quality Tier 5
+  score: 140
+- name: DVD Remux
+  score: 130
+- name: DVD
+  score: 120
+- name: 480p WEBRip
+  score: 100
+- name: Amazon Prime
+  score: 40
+- name: Disney+
+  score: 40
+- name: Movies Anywhere
+  score: 40
+- name: Apple TV+
   score: 30
-- name: Amazon Prime [1080p]
-  score: 30
-- name: Apple TV+ [1080p]
-  score: 30
-- name: Disney+ [1080p]
+- name: Criterion Channel
   score: 30
 - name: Dolby Vision
   score: 30
-- name: Movies Anywhere [1080p]
+- name: HBO Max
+  score: 30
+- name: Max
+  score: 30
+- name: Netflix
+  score: 30
+- name: Paramount+
+  score: 30
+- name: Peacock
   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: HDR10+
   score: 20
-- name: Max [1080p]
+- name: Hulu
   score: 20
-- name: Netflix [1080p]
+- name: iTunes
+  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: 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
@@ -135,34 +145,6 @@ custom_formats:
   score: 5
 - name: Unknown Lossless Audio
   score: 5
-- name: 1080p Bluray
-  score: 0
-- name: 1080p WEB-DL
-  score: 0
-- name: 1080p WEBRip
-  score: 0
-- name: 2160p WEB-DL
-  score: 0
-- name: 480p WEB-DL
-  score: 0
-- name: 480p WEBRip
-  score: 0
-- name: 720p Bluray
-  score: 0
-- name: 720p WEB-DL
-  score: 0
-- name: 720p WEBRip
-  score: 0
-- name: DVD
-  score: 0
-- name: Remux (Quality Match)
-  score: 0
-- name: SDR
-  score: -80
-- name: x265
-  score: -150
-- name: x265 (Missing 2160p)
-  score: -150
 - name: 3D
   score: -9999
 - name: AV1