From 0b1d686c27234ee021ef1744a65cb8c4d8c83434 Mon Sep 17 00:00:00 2001
From: Seraphys <xshatterx@protonmail.com>
Date: Thu, 21 Aug 2025 19:00:14 -0500
Subject: [PATCH] tweak(format): Overhaul / Rename Efficient+ CF

---
 ...ier 0.yml => 1080p Bluray HEVC Tier 1.yml} |  2 +-
 ... 1080p Efficient+ Movie Bluray Tier 1.yml} |  6 +--
 ... 1080p Efficient+ Movie Bluray Tier 2.yml} |  6 +--
 ... 1080p Efficient+ Movie Bluray Tier 3.yml} |  6 +--
 ... 1080p Efficient+ Movie Bluray Tier 4.yml} | 14 ++---
 ... 1080p Efficient+ Movie Bluray Tier 5.yml} | 30 +++++------
 ... => 1080p Efficient+ Movie WEB Tier 1.yml} |  2 +-
 ... => 1080p Efficient+ Movie WEB Tier 2.yml} |  6 +--
 ... => 1080p Efficient+ Movie WEB Tier 3.yml} |  6 +--
 ... => 1080p Efficient+ Movie WEB Tier 4.yml} |  2 +-
 ... => 1080p Efficient+ Movie WEB Tier 5.yml} |  2 +-
 ... => 1080p Efficient+ TV Bluray Tier 1.yml} |  6 +--
 ... => 1080p Efficient+ TV Bluray Tier 2.yml} |  6 +--
 ... => 1080p Efficient+ TV Bluray Tier 3.yml} |  2 +-
 ... => 1080p Efficient+ TV Bluray Tier 4.yml} |  6 +--
 ... => 1080p Efficient+ TV Bluray Tier 5.yml} |  6 +--
 ... => 1080p Efficient+ TV Bluray Tier 6.yml} |  2 +-
 ... => 1080p Efficient+ TV Bluray Tier 7.yml} |  2 +-
 ...yml => 1080p Efficient+ TV WEB Tier 1.yml} |  2 +-
 ...yml => 1080p Efficient+ TV WEB Tier 2.yml} |  6 +--
 ...yml => 1080p Efficient+ TV WEB Tier 3.yml} |  2 +-
 ...yml => 1080p Efficient+ TV WEB Tier 4.yml} |  2 +-
 ...yml => 1080p Efficient+ TV WEB Tier 5.yml} |  2 +-
 ...yml => 1080p Efficient+ TV WEB Tier 6.yml} |  6 +--
 custom_formats/1080p WEB-DL HEVC Tier 2.yml   | 33 ------------
 custom_formats/1080p WEB-DL HEVC Tier 3.yml   | 33 ------------
 profiles/1080p Balanced+.yml                  |  2 +-
 profiles/1080p Efficient+.yml                 | 52 +++++++++----------
 28 files changed, 91 insertions(+), 161 deletions(-)
 rename custom_formats/{1080p Bluray HEVC Tier 0.yml => 1080p Bluray HEVC Tier 1.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 1 (Radarr).yml => 1080p Efficient+ Movie Bluray Tier 1.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 2 (Radarr).yml => 1080p Efficient+ Movie Bluray Tier 2.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 3 (Radarr).yml => 1080p Efficient+ Movie Bluray Tier 3.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 4 (Radarr).yml => 1080p Efficient+ Movie Bluray Tier 4.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 5 (Radarr).yml => 1080p Efficient+ Movie Bluray Tier 5.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 1 (Radarr).yml => 1080p Efficient+ Movie WEB Tier 1.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 2 (Radarr).yml => 1080p Efficient+ Movie WEB Tier 2.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 3 (Radarr).yml => 1080p Efficient+ Movie WEB Tier 3.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 4 (Radarr).yml => 1080p Efficient+ Movie WEB Tier 4.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 5 (Radarr).yml => 1080p Efficient+ Movie WEB Tier 5.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 1 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 1.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 2 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 2.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 3 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 3.yml} (97%)
 rename custom_formats/{1080p Efficient Bluray Tier 4 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 4.yml} (98%)
 rename custom_formats/{1080p Efficient Bluray Tier 5 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 5.yml} (97%)
 rename custom_formats/{1080p Efficient Bluray Tier 6 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 6.yml} (97%)
 rename custom_formats/{1080p Efficient Bluray Tier 7 (Sonarr).yml => 1080p Efficient+ TV Bluray Tier 7.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 1 (Sonarr).yml => 1080p Efficient+ TV WEB Tier 1.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 2 (Sonarr).yml => 1080p Efficient+ TV WEB Tier 2.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 3 (Sonarr).yml => 1080p Efficient+ TV WEB Tier 3.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 4 (Sonarr).yml => 1080p Efficient+ TV WEB Tier 4.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 5 (Sonarr).yml => 1080p Efficient+ TV WEB Tier 5.yml} (98%)
 rename custom_formats/{1080p Efficient WEB Tier 6 (Sonarr).yml => 1080p Efficient+ TV WEB Tier 6.yml} (98%)
 delete mode 100644 custom_formats/1080p WEB-DL HEVC Tier 2.yml
 delete mode 100644 custom_formats/1080p WEB-DL HEVC Tier 3.yml

diff --git a/custom_formats/1080p Bluray HEVC Tier 0.yml b/custom_formats/1080p Bluray HEVC Tier 1.yml
similarity index 98%
rename from custom_formats/1080p Bluray HEVC Tier 0.yml
rename to custom_formats/1080p Bluray HEVC Tier 1.yml
index c287b4c..a7aafab 100644
--- a/custom_formats/1080p Bluray HEVC Tier 0.yml	
+++ b/custom_formats/1080p Bluray HEVC Tier 1.yml	
@@ -1,4 +1,4 @@
-name: 1080p Bluray HEVC Tier 0
+name: 1080p Bluray HEVC Tier 1
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 0
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient Bluray Tier 1 (Radarr).yml b/custom_formats/1080p Efficient+ Movie Bluray Tier 1.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 1 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie Bluray Tier 1.yml
index 2913ac0..5eec534 100644
--- a/custom_formats/1080p Efficient Bluray Tier 1 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie Bluray Tier 1.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 1 (Radarr)
+name: 1080p Efficient+ Movie Bluray Tier 1
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 1
 tags:
 - Release Group Tier
@@ -22,10 +22,10 @@ conditions:
   required: true
   type: release_title
 - name: NAN0
-  type: release_group
-  required: false
   negate: false
   pattern: NAN0
+  required: false
+  type: release_group
 - name: QxR
   negate: false
   pattern: QxR
diff --git a/custom_formats/1080p Efficient Bluray Tier 2 (Radarr).yml b/custom_formats/1080p Efficient+ Movie Bluray Tier 2.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 2 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie Bluray Tier 2.yml
index 0fa242b..ee8a058 100644
--- a/custom_formats/1080p Efficient Bluray Tier 2 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie Bluray Tier 2.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 2 (Radarr)
+name: 1080p Efficient+ Movie Bluray Tier 2
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 2
 tags:
 - Release Group Tier
@@ -22,10 +22,10 @@ conditions:
   required: true
   type: release_title
 - name: DarQ
-  type: release_group
-  required: false
   negate: false
   pattern: DarQ
+  required: false
+  type: release_group
 - name: SQS
   negate: false
   pattern: SQS
diff --git a/custom_formats/1080p Efficient Bluray Tier 3 (Radarr).yml b/custom_formats/1080p Efficient+ Movie Bluray Tier 3.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 3 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie Bluray Tier 3.yml
index e4acd8a..2c3fc35 100644
--- a/custom_formats/1080p Efficient Bluray Tier 3 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie Bluray Tier 3.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 3 (Radarr)
+name: 1080p Efficient+ Movie Bluray Tier 3
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 3
 tags:
 - Release Group Tier
@@ -42,10 +42,10 @@ conditions:
   required: false
   type: release_group
 - name: Vialle
-  type: release_group
-  required: false
   negate: false
   pattern: Vialle
+  required: false
+  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml b/custom_formats/1080p Efficient+ Movie Bluray Tier 4.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie Bluray Tier 4.yml
index 2d3f8db..8c444bc 100644
--- a/custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie Bluray Tier 4.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 4 (Radarr)
+name: 1080p Efficient+ Movie Bluray Tier 4
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 4
 tags:
 - Release Group Tier
@@ -22,20 +22,20 @@ conditions:
   required: true
   type: release_title
 - name: dkore
-  type: release_group
-  required: false
   negate: false
   pattern: dkore
-- name: GRiMM
-  type: release_group
   required: false
+  type: release_group
+- name: GRiMM
   negate: false
   pattern: GRiMM
-- name: TimeDistortion
-  type: release_group
   required: false
+  type: release_group
+- name: TimeDistortion
   negate: false
   pattern: TimeDistortion
+  required: false
+  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient Bluray Tier 5 (Radarr).yml b/custom_formats/1080p Efficient+ Movie Bluray Tier 5.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 5 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie Bluray Tier 5.yml
index 3b060cc..59bbcdc 100644
--- a/custom_formats/1080p Efficient Bluray Tier 5 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie Bluray Tier 5.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 5 (Radarr)
+name: 1080p Efficient+ Movie Bluray Tier 5
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 4
 tags:
 - Release Group Tier
@@ -22,40 +22,40 @@ conditions:
   required: true
   type: release_title
 - name: Chivaman
-  type: release_group
-  required: false
   negate: false
   pattern: Chivaman
-- name: edge2020
-  type: release_group
   required: false
+  type: release_group
+- name: edge2020
   negate: false
   pattern: edge2020
-- name: R1GY3B
-  type: release_group
   required: false
+  type: release_group
+- name: R1GY3B
   negate: false
   pattern: R1GY3B
-- name: Ralphy
-  type: release_group
   required: false
+  type: release_group
+- name: Ralphy
   negate: false
   pattern: Ralphy
-- name: ToNaTo
-  type: release_group
   required: false
+  type: release_group
+- name: ToNaTo
   negate: false
   pattern: ToNaTo
-- name: Vyndros
-  type: release_group
   required: false
+  type: release_group
+- name: Vyndros
   negate: false
   pattern: Vyndros
-- name: YELLO
-  type: release_group
   required: false
+  type: release_group
+- name: YELLO
   negate: false
   pattern: YELLO
+  required: false
+  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient WEB Tier 1 (Radarr).yml b/custom_formats/1080p Efficient+ Movie WEB Tier 1.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 1 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie WEB Tier 1.yml
index 38e4692..ff8592c 100644
--- a/custom_formats/1080p Efficient WEB Tier 1 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie WEB Tier 1.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 1 (Radarr)
+name: 1080p Efficient+ Movie WEB Tier 1
 description: Matches release groups who fall under 1080p Efficient WEB Tier 1
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 2 (Radarr).yml b/custom_formats/1080p Efficient+ Movie WEB Tier 2.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 2 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie WEB Tier 2.yml
index b90af0f..81c0206 100644
--- a/custom_formats/1080p Efficient WEB Tier 2 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie WEB Tier 2.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 2 (Radarr)
+name: 1080p Efficient+ Movie WEB Tier 2
 description: Matches release groups who fall under 1080p Efficient WEB Tier 2
 tags:
 - Release Group Tier
@@ -27,10 +27,10 @@ conditions:
   source: webrip
   type: source
 - name: DarQ
-  type: release_group
-  required: false
   negate: false
   pattern: DarQ
+  required: false
+  type: release_group
 - name: dkore
   negate: false
   pattern: dkore
diff --git a/custom_formats/1080p Efficient WEB Tier 3 (Radarr).yml b/custom_formats/1080p Efficient+ Movie WEB Tier 3.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 3 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie WEB Tier 3.yml
index 7bcfea6..79fa721 100644
--- a/custom_formats/1080p Efficient WEB Tier 3 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie WEB Tier 3.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 3 (Radarr)
+name: 1080p Efficient+ Movie WEB Tier 3
 description: Matches release groups who fall under 1080p Efficient WEB Tier 3
 tags:
 - Release Group Tier
@@ -32,10 +32,10 @@ conditions:
   required: false
   type: release_group
 - name: R1GY3B
-  type: release_group
-  required: false
   negate: false
   pattern: R1GY3B
+  required: false
+  type: release_group
 - name: ToNaTo
   negate: false
   pattern: ToNaTo
diff --git a/custom_formats/1080p Efficient WEB Tier 4 (Radarr).yml b/custom_formats/1080p Efficient+ Movie WEB Tier 4.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 4 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie WEB Tier 4.yml
index f9c6b04..3cc830f 100644
--- a/custom_formats/1080p Efficient WEB Tier 4 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie WEB Tier 4.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 4 (Radarr)
+name: 1080p Efficient+ Movie WEB Tier 4
 description: Matches release groups who fall under 1080p Efficient WEB Tier 3
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 5 (Radarr).yml b/custom_formats/1080p Efficient+ Movie WEB Tier 5.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 5 (Radarr).yml
rename to custom_formats/1080p Efficient+ Movie WEB Tier 5.yml
index 4541a78..4200eae 100644
--- a/custom_formats/1080p Efficient WEB Tier 5 (Radarr).yml	
+++ b/custom_formats/1080p Efficient+ Movie WEB Tier 5.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 5 (Radarr)
+name: 1080p Efficient+ Movie WEB Tier 5
 description: Matches release groups who fall under 1080p Efficient WEB Tier 3
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient Bluray Tier 1 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 1.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 1 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 1.yml
index c6689c5..0428611 100644
--- a/custom_formats/1080p Efficient Bluray Tier 1 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 1.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 1 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 1
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 1
 tags:
 - Release Group Tier
@@ -22,10 +22,10 @@ conditions:
   required: true
   type: release_title
 - name: NAN0
-  type: release_group
-  required: false
   negate: false
   pattern: NAN0
+  required: false
+  type: release_group
 - name: QxR
   negate: false
   pattern: QxR
diff --git a/custom_formats/1080p Efficient Bluray Tier 2 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 2.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 2 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 2.yml
index bb3ef45..12713ac 100644
--- a/custom_formats/1080p Efficient Bluray Tier 2 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 2.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 2 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 2
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 2
 tags:
 - Release Group Tier
@@ -42,10 +42,10 @@ conditions:
   required: false
   type: release_group
 - name: Vialle
-  type: release_group
-  required: false
   negate: false
   pattern: Vialle
+  required: false
+  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient Bluray Tier 3 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 3.yml
similarity index 97%
rename from custom_formats/1080p Efficient Bluray Tier 3 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 3.yml
index 5ac28e3..347420e 100644
--- a/custom_formats/1080p Efficient Bluray Tier 3 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 3.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 3 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 3
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 3
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient Bluray Tier 4 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 4.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 4 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 4.yml
index b58aec2..8eef6c2 100644
--- a/custom_formats/1080p Efficient Bluray Tier 4 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 4.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 4 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 4
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 4
 tags:
 - Release Group Tier
@@ -47,10 +47,10 @@ conditions:
   required: false
   type: release_group
 - name: ToNaTo
-  type: release_group
-  required: false
   negate: false
   pattern: ToNaTo
+  required: false
+  type: release_group
 - name: YELLO
   negate: false
   pattern: YELLO
diff --git a/custom_formats/1080p Efficient Bluray Tier 5 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 5.yml
similarity index 97%
rename from custom_formats/1080p Efficient Bluray Tier 5 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 5.yml
index d491abf..2090004 100644
--- a/custom_formats/1080p Efficient Bluray Tier 5 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 5.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 5 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 5
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 5
 tags:
 - Release Group Tier
@@ -22,10 +22,10 @@ conditions:
   required: true
   type: release_title
 - name: Vyndros
-  type: release_group
-  required: false
   negate: false
   pattern: Vyndros
+  required: false
+  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient Bluray Tier 6 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 6.yml
similarity index 97%
rename from custom_formats/1080p Efficient Bluray Tier 6 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 6.yml
index 8987b9e..48bf446 100644
--- a/custom_formats/1080p Efficient Bluray Tier 6 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 6.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 6 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 6
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 6
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient Bluray Tier 7 (Sonarr).yml b/custom_formats/1080p Efficient+ TV Bluray Tier 7.yml
similarity index 98%
rename from custom_formats/1080p Efficient Bluray Tier 7 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV Bluray Tier 7.yml
index 8750dca..fa4d094 100644
--- a/custom_formats/1080p Efficient Bluray Tier 7 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV Bluray Tier 7.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient Bluray Tier 7 (Sonarr)
+name: 1080p Efficient+ TV Bluray Tier 7
 description: Matches release groups who fall under 1080p Efficient Bluray Tier 7
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 1 (Sonarr).yml b/custom_formats/1080p Efficient+ TV WEB Tier 1.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 1 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV WEB Tier 1.yml
index 0a568eb..7ad0071 100644
--- a/custom_formats/1080p Efficient WEB Tier 1 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV WEB Tier 1.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 1 (Sonarr)
+name: 1080p Efficient+ TV WEB Tier 1
 description: Matches release groups who fall under 1080p Efficient WEB Tier 1
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 2 (Sonarr).yml b/custom_formats/1080p Efficient+ TV WEB Tier 2.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 2 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV WEB Tier 2.yml
index 756891f..7788210 100644
--- a/custom_formats/1080p Efficient WEB Tier 2 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV WEB Tier 2.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 2 (Sonarr)
+name: 1080p Efficient+ TV WEB Tier 2
 description: Matches release groups who fall under 1080p Efficient WEB Tier 2
 tags:
 - Release Group Tier
@@ -47,10 +47,10 @@ conditions:
   required: false
   type: release_group
 - name: Vialle
-  type: release_group
-  required: false
   negate: false
   pattern: Vialle
+  required: false
+  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient WEB Tier 3 (Sonarr).yml b/custom_formats/1080p Efficient+ TV WEB Tier 3.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 3 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV WEB Tier 3.yml
index 2c79b8e..604ba04 100644
--- a/custom_formats/1080p Efficient WEB Tier 3 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV WEB Tier 3.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 3 (Sonarr)
+name: 1080p Efficient+ TV WEB Tier 3
 description: Matches release groups who fall under 1080p Efficient WEB Tier 3
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 4 (Sonarr).yml b/custom_formats/1080p Efficient+ TV WEB Tier 4.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 4 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV WEB Tier 4.yml
index 673a21c..5192f2b 100644
--- a/custom_formats/1080p Efficient WEB Tier 4 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV WEB Tier 4.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 4 (Sonarr)
+name: 1080p Efficient+ TV WEB Tier 4
 description: Matches release groups who fall under 1080p Efficient WEB Tier 4
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 5 (Sonarr).yml b/custom_formats/1080p Efficient+ TV WEB Tier 5.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 5 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV WEB Tier 5.yml
index 63550c1..7ac81a0 100644
--- a/custom_formats/1080p Efficient WEB Tier 5 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV WEB Tier 5.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 5 (Sonarr)
+name: 1080p Efficient+ TV WEB Tier 5
 description: Matches release groups who fall under 1080p Efficient WEB Tier 5
 tags:
 - Release Group Tier
diff --git a/custom_formats/1080p Efficient WEB Tier 6 (Sonarr).yml b/custom_formats/1080p Efficient+ TV WEB Tier 6.yml
similarity index 98%
rename from custom_formats/1080p Efficient WEB Tier 6 (Sonarr).yml
rename to custom_formats/1080p Efficient+ TV WEB Tier 6.yml
index 38f90a3..b5547fc 100644
--- a/custom_formats/1080p Efficient WEB Tier 6 (Sonarr).yml	
+++ b/custom_formats/1080p Efficient+ TV WEB Tier 6.yml	
@@ -1,4 +1,4 @@
-name: 1080p Efficient WEB Tier 6 (Sonarr)
+name: 1080p Efficient+ TV WEB Tier 6
 description: Matches release groups who fall under 1080p Efficient WEB Tier 6
 tags:
 - Release Group Tier
@@ -27,10 +27,10 @@ conditions:
   source: webrip
   type: source
 - name: HODL
-  type: release_group
-  required: false
   negate: false
   pattern: HODL
+  required: false
+  type: release_group
 - name: iVy
   negate: false
   pattern: iVy
diff --git a/custom_formats/1080p WEB-DL HEVC Tier 2.yml b/custom_formats/1080p WEB-DL HEVC Tier 2.yml
deleted file mode 100644
index 4ad2adf..0000000
--- a/custom_formats/1080p WEB-DL HEVC Tier 2.yml	
+++ /dev/null
@@ -1,33 +0,0 @@
-name: 1080p WEB-DL HEVC Tier 2
-description: Matches 1080p WEB-DLs.
-tags:
-- Release Group Tier
-- 1080p
-- HEVC
-conditions:
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
-- name: WEB-DL
-  negate: false
-  required: true
-  source: web_dl
-  type: source
-- name: h265
-  negate: false
-  pattern: HEVC
-  required: true
-  type: release_title
-- name: ARCADE
-  negate: false
-  pattern: ARCADE
-  required: false
-  type: release_group
-- name: Yoyo
-  negate: false
-  pattern: Yoyo
-  required: false
-  type: release_group
-tests: []
diff --git a/custom_formats/1080p WEB-DL HEVC Tier 3.yml b/custom_formats/1080p WEB-DL HEVC Tier 3.yml
deleted file mode 100644
index 5dc9ce1..0000000
--- a/custom_formats/1080p WEB-DL HEVC Tier 3.yml	
+++ /dev/null
@@ -1,33 +0,0 @@
-name: 1080p WEB-DL HEVC Tier 3
-description: Matches 1080p WEB-DLs.
-tags:
-- Release Group Tier
-- 1080p
-- HEVC
-conditions:
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
-- name: WEB-DL
-  negate: false
-  required: true
-  source: web_dl
-  type: source
-- name: h265
-  negate: false
-  pattern: HEVC
-  required: true
-  type: release_title
-- name: GRiMM
-  negate: false
-  pattern: GRiMM
-  required: false
-  type: release_group
-- name: OnlyWeb
-  negate: false
-  pattern: OnlyWeb
-  required: false
-  type: release_group
-tests: []
diff --git a/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml
index 41bc701..48b6a45 100644
--- a/profiles/1080p Balanced+.yml	
+++ b/profiles/1080p Balanced+.yml	
@@ -19,7 +19,7 @@ minCustomFormatScore: 20000
 upgradeUntilScore: 400000
 minScoreIncrement: 1
 custom_formats:
-- name: 1080p Bluray HEVC Tier 0
+- name: 1080p Bluray HEVC Tier 1
   score: 180000
 - name: 1080p WEB-DL HEVC Tier 1
   score: 160000
diff --git a/profiles/1080p Efficient+.yml b/profiles/1080p Efficient+.yml
index 470c56a..f9dfda9 100644
--- a/profiles/1080p Efficient+.yml	
+++ b/profiles/1080p Efficient+.yml	
@@ -11,14 +11,10 @@ minCustomFormatScore: 20000
 upgradeUntilScore: 400000
 minScoreIncrement: 1
 custom_formats:
-- name: 1080p Bluray HEVC Tier 0
-  score: 240000
-- name: 1080p WEB-DL HEVC Tier 1
+- name: 1080p Bluray HEVC Tier 1
   score: 220000
-- name: 1080p WEB-DL HEVC Tier 2
+- name: 1080p WEB-DL HEVC Tier 1
   score: 200000
-- name: 1080p WEB-DL HEVC Tier 3
-  score: 170000
 - name: 1080p Balanced Tier 1
   score: 140000
 - name: 1080p WEB-DL (h264)
@@ -164,23 +160,23 @@ custom_formats:
 - name: x265 (Efficient)
   score: -999999
 custom_formats_radarr:
-- name: 1080p Efficient Bluray Tier 1 (Radarr)
+- name: 1080p Efficient+ Movie Bluray Tier 1
   score: 184000
-- name: 1080p Efficient Bluray Tier 2 (Radarr)
+- name: 1080p Efficient+ Movie Bluray Tier 2
   score: 183000
-- name: 1080p Efficient Bluray Tier 3 (Radarr)
+- name: 1080p Efficient+ Movie Bluray Tier 3
   score: 182000
-- name: 1080p Efficient Bluray Tier 4 (Radarr)
+- name: 1080p Efficient+ Movie Bluray Tier 4
   score: 181000
-- name: 1080p Efficient Bluray Tier 5 (Radarr)
+- name: 1080p Efficient+ Movie Bluray Tier 5
   score: 180000
-- name: 1080p Efficient WEB Tier 1 (Radarr)
+- name: 1080p Efficient+ Movie WEB Tier 1
   score: 163000
-- name: 1080p Efficient WEB Tier 2 (Radarr)
+- name: 1080p Efficient+ Movie WEB Tier 2
   score: 162000
-- name: 1080p Efficient WEB Tier 3 (Radarr)
+- name: 1080p Efficient+ Movie WEB Tier 3
   score: 161000
-- name: 1080p Efficient WEB Tier 4 (Radarr)
+- name: 1080p Efficient+ Movie WEB Tier 4
   score: 160000
 - name: 720p Golden Popcorn
   score: 6000
@@ -203,31 +199,31 @@ custom_formats_radarr:
 - name: Sing Along
   score: -999999
 custom_formats_sonarr:
-- name: 1080p Efficient Bluray Tier 1 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 1
   score: 184000
-- name: 1080p Efficient Bluray Tier 2 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 2
   score: 183000
-- name: 1080p Efficient Bluray Tier 3 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 3
   score: 182000
-- name: 1080p Efficient Bluray Tier 4 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 4
   score: 181000
-- name: 1080p Efficient Bluray Tier 5 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 5
   score: 180000
-- name: 1080p Efficient WEB Tier 1 (Sonarr)
+- name: 1080p Efficient+ TV WEB Tier 1
   score: 167000
-- name: 1080p Efficient WEB Tier 2 (Sonarr)
+- name: 1080p Efficient+ TV WEB Tier 2
   score: 166000
-- name: 1080p Efficient WEB Tier 3 (Sonarr)
+- name: 1080p Efficient+ TV WEB Tier 3
   score: 165000
-- name: 1080p Efficient WEB Tier 4 (Sonarr)
+- name: 1080p Efficient+ TV WEB Tier 4
   score: 164000
-- name: 1080p Efficient Bluray Tier 6 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 6
   score: 163000
-- name: 1080p Efficient Bluray Tier 7 (Sonarr)
+- name: 1080p Efficient+ TV Bluray Tier 7
   score: 162000
-- name: 1080p Efficient WEB Tier 5 (Sonarr)
+- name: 1080p Efficient+ TV WEB Tier 5
   score: 161000
-- name: 1080p Efficient WEB Tier 6 (Sonarr)
+- name: 1080p Efficient+ TV WEB Tier 6
   score: 160000
 - name: Season Pack
   score: 10