diff --git a/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml
index 5be0a27..a4600b9 100644
--- a/profiles/1080p Balanced+.yml	
+++ b/profiles/1080p Balanced+.yml	
@@ -54,10 +54,20 @@ custom_formats:
   score: 11000
 - name: SD Quality Tier 2
   score: 10000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
 - name: Dolby Vision
   score: 3000
+- name: DSNP
+  score: 3000
 - name: HDR10+
   score: 2000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: ATV
   score: 1000
 - name: HDR
@@ -154,21 +164,11 @@ custom_formats_radarr:
 - name: 720p Golden Popcorn
   score: 6000
 - name: MA
-  score: 4000
+  score: 5000
 - name: SD Golden Popcorn
   score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -178,16 +178,6 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities:
diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml
index 0d45f99..7218d75 100644
--- a/profiles/1080p Balanced.yml	
+++ b/profiles/1080p Balanced.yml	
@@ -53,6 +53,16 @@ custom_formats:
   score: 11000
 - name: SD Quality Tier 2
   score: 10000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
+- name: DSNP
+  score: 3000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: ATV
   score: 1000
 - name: iT
@@ -151,21 +161,11 @@ custom_formats_radarr:
 - name: 720p Golden Popcorn
   score: 6000
 - name: MA
-  score: 4000
+  score: 5000
 - name: SD Golden Popcorn
   score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -175,16 +175,6 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities:
diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml
index f8ebcb5..bee7256 100644
--- a/profiles/1080p Efficient.yml	
+++ b/profiles/1080p Efficient.yml	
@@ -51,10 +51,20 @@ custom_formats:
   score: 11000
 - name: SD Quality Tier 2
   score: 10000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
 - name: Dolby Vision
   score: 3000
+- name: DSNP
+  score: 3000
 - name: HDR10+
   score: 2000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: ATV
   score: 1000
 - name: DS4K
@@ -177,21 +187,11 @@ custom_formats_radarr:
 - name: 720p Golden Popcorn
   score: 6000
 - name: MA
-  score: 4000
+  score: 5000
 - name: SD Golden Popcorn
   score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -223,16 +223,6 @@ custom_formats_sonarr:
   score: 161000
 - name: 1080p Efficient WEB Tier 5 (Sonarr)
   score: 160000
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities:
diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml
index befd180..2d8b044 100644
--- a/profiles/1080p Quality (HDR).yml	
+++ b/profiles/1080p Quality (HDR).yml	
@@ -69,10 +69,20 @@ custom_formats:
   score: 11000
 - name: SD Quality Tier 2
   score: 10000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
 - name: Dolby Vision
   score: 3000
+- name: DSNP
+  score: 3000
 - name: HDR10+
   score: 2000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: ATV
   score: 1000
 - name: HDR
@@ -175,21 +185,11 @@ custom_formats_radarr:
 - name: 720p Golden Popcorn
   score: 6000
 - name: MA
-  score: 4000
+  score: 5000
 - name: SD Golden Popcorn
   score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -199,16 +199,6 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities:
diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml
index 850950a..d4d43c4 100644
--- a/profiles/1080p Quality.yml	
+++ b/profiles/1080p Quality.yml	
@@ -61,6 +61,16 @@ custom_formats:
   score: 11000
 - name: SD Quality Tier 2
   score: 10000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
+- name: DSNP
+  score: 3000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: iT
   score: 1000
 - name: NF
@@ -159,23 +169,13 @@ custom_formats_radarr:
 - name: 720p Golden Popcorn
   score: 6000
 - name: MA
-  score: 4000
+  score: 5000
 - name: SD Golden Popcorn
   score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
 - name: ATV
   score: 1000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -185,16 +185,6 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities:
diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml
index 61f3bd1..c89d835 100644
--- a/profiles/1080p Remux.yml	
+++ b/profiles/1080p Remux.yml	
@@ -52,6 +52,12 @@ custom_formats:
   score: 5000
 - name: Dolby Digital +
   score: 4000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
+- name: DSNP
+  score: 3000
 - name: DTS-ES
   score: 3000
 - name: Atmos
@@ -60,6 +66,10 @@ custom_formats:
   score: 2000
 - name: DTS
   score: 2000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: ATV
   score: 1000
 - name: Dolby Digital
@@ -152,19 +162,9 @@ custom_formats:
   score: -999999
 custom_formats_radarr:
 - name: MA
-  score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
+  score: 5000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -174,16 +174,6 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities:
diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml
index b600d01..cfd26bd 100644
--- a/profiles/720p Quality.yml	
+++ b/profiles/720p Quality.yml	
@@ -42,6 +42,16 @@ custom_formats:
   score: 11000
 - name: SD Quality Tier 2
   score: 10000
+- name: AMZN
+  score: 3000
+- name: ATVP
+  score: 3000
+- name: DSNP
+  score: 3000
+- name: HMAX
+  score: 2000
+- name: MAX
+  score: 2000
 - name: ATV
   score: 1000
 - name: iT
@@ -140,21 +150,11 @@ custom_formats_radarr:
 - name: 720p Golden Popcorn
   score: 6000
 - name: MA
-  score: 4000
+  score: 5000
 - name: SD Golden Popcorn
   score: 4000
-- name: AMZN
-  score: 2000
-- name: ATVP
-  score: 2000
-- name: DSNP
-  score: 2000
 - name: CRIT
   score: 1000
-- name: HMAX
-  score: 1000
-- name: MAX
-  score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
@@ -164,16 +164,6 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: AMZN
-  score: 3000
-- name: ATVP
-  score: 3000
-- name: DSNP
-  score: 3000
-- name: HMAX
-  score: 2000
-- name: MAX
-  score: 2000
 - name: Season Pack
   score: 10
 qualities: