diff --git a/custom_formats/1080p Balanced Tier 1.yml b/custom_formats/1080p Balanced Tier 1.yml
index ab33056..efbeeb7 100644
--- a/custom_formats/1080p Balanced Tier 1.yml	
+++ b/custom_formats/1080p Balanced Tier 1.yml	
@@ -2,8 +2,8 @@ name: 1080p Balanced Tier 1
 description: Matches release groups who fall under 1080p Balanced Tier 1
 tags:
 - Release Group Tier
-- Balanced
 - 1080p
+- Balanced
 conditions:
 - name: 1080p
   negate: false
diff --git a/custom_formats/1080p Balanced Tier 2.yml b/custom_formats/1080p Balanced Tier 2.yml
index 7b3a3aa..0a2a112 100644
--- a/custom_formats/1080p Balanced Tier 2.yml	
+++ b/custom_formats/1080p Balanced Tier 2.yml	
@@ -2,8 +2,8 @@ name: 1080p Balanced Tier 2
 description: Matches release groups who fall under 1080p Balanced Tier 2
 tags:
 - Release Group Tier
-- Balanced
 - 1080p
+- Balanced
 conditions:
 - name: 1080p
   negate: false
diff --git a/custom_formats/2160p Balanced Tier 1.yml b/custom_formats/2160p Balanced Tier 1.yml
index cedc845..d05c4cb 100644
--- a/custom_formats/2160p Balanced Tier 1.yml	
+++ b/custom_formats/2160p Balanced Tier 1.yml	
@@ -2,8 +2,8 @@ name: 2160p Balanced Tier 1
 description: Matches release groups who fall under 2160p Balanced Tier 1
 tags:
 - Release Group Tier
-- Balanced
 - 2160p
+- Balanced
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Balanced Tier 2.yml b/custom_formats/2160p Balanced Tier 2.yml
index 47ffe0a..376ce40 100644
--- a/custom_formats/2160p Balanced Tier 2.yml	
+++ b/custom_formats/2160p Balanced Tier 2.yml	
@@ -2,8 +2,8 @@ name: 2160p Balanced Tier 2
 description: Matches release groups who fall under 2160p Balanced Tier 2
 tags:
 - Release Group Tier
-- Balanced
 - 2160p
+- Balanced
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Quality Tier 1.yml b/custom_formats/2160p Quality Tier 1.yml
index 2c16d3d..3e818ff 100644
--- a/custom_formats/2160p Quality Tier 1.yml	
+++ b/custom_formats/2160p Quality Tier 1.yml	
@@ -2,8 +2,8 @@ name: 2160p Quality Tier 1
 description: Matches release groups who fall under 2160p Quality Tier 1
 tags:
 - Release Group Tier
-- Quality
 - 2160p
+- Quality
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Quality Tier 2.yml b/custom_formats/2160p Quality Tier 2.yml
index 27b1e76..ab3d533 100644
--- a/custom_formats/2160p Quality Tier 2.yml	
+++ b/custom_formats/2160p Quality Tier 2.yml	
@@ -2,8 +2,8 @@ name: 2160p Quality Tier 2
 description: Matches release groups who fall under 2160p Quality Tier 2
 tags:
 - Release Group Tier
-- Quality
 - 2160p
+- Quality
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Quality Tier 3.yml b/custom_formats/2160p Quality Tier 3.yml
index 6707e33..7d3e71f 100644
--- a/custom_formats/2160p Quality Tier 3.yml	
+++ b/custom_formats/2160p Quality Tier 3.yml	
@@ -2,8 +2,8 @@ name: 2160p Quality Tier 3
 description: Matches release groups who fall under 2160p Quality Tier 3
 tags:
 - Release Group Tier
-- Quality
 - 2160p
+- Quality
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Quality Tier 4.yml b/custom_formats/2160p Quality Tier 4.yml
index e73a92a..cbbc05d 100644
--- a/custom_formats/2160p Quality Tier 4.yml	
+++ b/custom_formats/2160p Quality Tier 4.yml	
@@ -2,8 +2,8 @@ name: 2160p Quality Tier 4
 description: Matches release groups who fall under 2160p Quality Tier 4
 tags:
 - Release Group Tier
-- Quality
 - 2160p
+- Quality
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Quality Tier 5.yml b/custom_formats/2160p Quality Tier 5.yml
index 9ffa71c..885f830 100644
--- a/custom_formats/2160p Quality Tier 5.yml	
+++ b/custom_formats/2160p Quality Tier 5.yml	
@@ -2,8 +2,8 @@ name: 2160p Quality Tier 5
 description: Matches release groups who fall under 2160p Quality Tier 5
 tags:
 - Release Group Tier
-- Quality
 - 2160p
+- Quality
 conditions:
 - name: 2160p
   negate: false
diff --git a/custom_formats/2160p Quality Tier 6.yml b/custom_formats/2160p Quality Tier 6.yml
index 2521000..b55c2d2 100644
--- a/custom_formats/2160p Quality Tier 6.yml	
+++ b/custom_formats/2160p Quality Tier 6.yml	
@@ -2,8 +2,8 @@ name: 2160p Quality Tier 6
 description: Matches release groups who fall under 2160p Quality Tier 6
 tags:
 - Release Group Tier
-- Quality
 - 2160p
+- Quality
 conditions:
 - name: 2160p
   negate: false
@@ -76,8 +76,8 @@ conditions:
   required: false
   type: release_group
 - name: THREESOME
-  type: release_group
-  required: false
   negate: false
   pattern: THREESOME
+  required: false
+  type: release_group
 tests: []
diff --git a/custom_formats/720p Quality Tier 1.yml b/custom_formats/720p Quality Tier 1.yml
index 9d2fc0d..ce59a63 100644
--- a/custom_formats/720p Quality Tier 1.yml	
+++ b/custom_formats/720p Quality Tier 1.yml	
@@ -1,7 +1,10 @@
 name: 720p Quality Tier 1
 description: Matches release groups who fall under 720p Quality Tier 1
 tags:
+- GPPi
 - Release Group Tier
+- 720p
+- Quality
 conditions:
 - name: 720p
   negate: false
diff --git a/custom_formats/720p Quality Tier 2.yml b/custom_formats/720p Quality Tier 2.yml
index ae44f80..e5abb16 100644
--- a/custom_formats/720p Quality Tier 2.yml	
+++ b/custom_formats/720p Quality Tier 2.yml	
@@ -1,7 +1,10 @@
 name: 720p Quality Tier 2
 description: Matches release groups who fall under 720p Quality Tier 2
 tags:
+- GPPi
 - Release Group Tier
+- 720p
+- Quality
 conditions:
 - name: 720p
   negate: false
diff --git a/custom_formats/720p Quality Tier 3.yml b/custom_formats/720p Quality Tier 3.yml
index f1c7887..f69f32f 100644
--- a/custom_formats/720p Quality Tier 3.yml	
+++ b/custom_formats/720p Quality Tier 3.yml	
@@ -1,7 +1,10 @@
 name: 720p Quality Tier 3
 description: Matches release groups who fall under 720p Quality Tier 3
 tags:
+- GPPi
 - Release Group Tier
+- 720p
+- Quality
 conditions:
 - name: 720p
   negate: false
diff --git a/custom_formats/720p Quality Tier 4.yml b/custom_formats/720p Quality Tier 4.yml
index 9395e9f..81548ca 100644
--- a/custom_formats/720p Quality Tier 4.yml	
+++ b/custom_formats/720p Quality Tier 4.yml	
@@ -1,7 +1,10 @@
 name: 720p Quality Tier 4
 description: Matches release groups who fall under 720p Quality Tier 4
 tags:
+- GPPi
 - Release Group Tier
+- 720p
+- Quality
 conditions:
 - name: 720p
   negate: false
diff --git a/custom_formats/720p Quality Tier 5.yml b/custom_formats/720p Quality Tier 5.yml
index ec287aa..a22a071 100644
--- a/custom_formats/720p Quality Tier 5.yml	
+++ b/custom_formats/720p Quality Tier 5.yml	
@@ -1,7 +1,10 @@
 name: 720p Quality Tier 5
 description: Matches release groups who fall under 720p Quality Tier 5
 tags:
+- GPPi
 - Release Group Tier
+- 720p
+- Quality
 conditions:
 - name: 720p
   negate: false
diff --git a/custom_formats/Amazon Prime.yml b/custom_formats/Amazon Prime.yml
index 36b9ed0..6a40748 100644
--- a/custom_formats/Amazon Prime.yml	
+++ b/custom_formats/Amazon Prime.yml	
@@ -3,7 +3,6 @@ description: Matches 'Amazon Prime' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB1 [1080p]
 conditions:
 - name: AMZN Regex
   negate: false
diff --git a/custom_formats/Apple TV+.yml b/custom_formats/Apple TV+.yml
index 184ef7f..fca4142 100644
--- a/custom_formats/Apple TV+.yml	
+++ b/custom_formats/Apple TV+.yml	
@@ -3,7 +3,6 @@ description: Matches 'Apple TV+' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB1 [1080p]
 conditions:
 - name: APTV Regex
   negate: false
diff --git a/custom_formats/Criterion Channel.yml b/custom_formats/Criterion Channel.yml
index 90ee9ef..14f0c19 100644
--- a/custom_formats/Criterion Channel.yml	
+++ b/custom_formats/Criterion Channel.yml	
@@ -3,7 +3,6 @@ description: Matches 'Criterion Channel' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB2 [1080p]
 conditions:
 - name: CRiT Regex
   negate: false
diff --git a/custom_formats/Disney+.yml b/custom_formats/Disney+.yml
index 28a94a6..7bddfe5 100644
--- a/custom_formats/Disney+.yml
+++ b/custom_formats/Disney+.yml
@@ -3,7 +3,6 @@ description: Matches 'Disney+' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB1 [1080p]
 conditions:
 - name: DNSP Regex
   negate: false
diff --git a/custom_formats/HBO Max.yml b/custom_formats/HBO Max.yml
index d3eacf2..0c8072d 100644
--- a/custom_formats/HBO Max.yml	
+++ b/custom_formats/HBO Max.yml	
@@ -3,7 +3,6 @@ description: Matches 'HBO Max' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB2 [1080p]
 conditions:
 - name: HMAX Regex
   negate: false
diff --git a/custom_formats/Hulu.yml b/custom_formats/Hulu.yml
index 81297c6..58c2bea 100644
--- a/custom_formats/Hulu.yml
+++ b/custom_formats/Hulu.yml
@@ -3,7 +3,6 @@ description: Matches 'Hulu' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB3 [1080p]
 conditions:
 - name: Hulu Regex
   negate: false
diff --git a/custom_formats/Max.yml b/custom_formats/Max.yml
index f622863..221bb3e 100644
--- a/custom_formats/Max.yml
+++ b/custom_formats/Max.yml
@@ -3,7 +3,6 @@ description: Matches 'Max' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB2 [1080p]
 conditions:
 - name: MAX Regex
   negate: false
diff --git a/custom_formats/Movies Anywhere.yml b/custom_formats/Movies Anywhere.yml
index dedd8ac..a2c4bf8 100644
--- a/custom_formats/Movies Anywhere.yml	
+++ b/custom_formats/Movies Anywhere.yml	
@@ -3,7 +3,6 @@ description: Matches 'Movies Anywhere' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB1 [1080p]
 conditions:
 - name: MA Regex
   negate: false
diff --git a/custom_formats/Netflix.yml b/custom_formats/Netflix.yml
index ae984c9..a46d904 100644
--- a/custom_formats/Netflix.yml
+++ b/custom_formats/Netflix.yml
@@ -3,7 +3,6 @@ description: Matches 'Netflix' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB2 [1080p]
 conditions:
 - name: NF Regex
   negate: false
diff --git a/custom_formats/Paramount+.yml b/custom_formats/Paramount+.yml
index 9d39172..73a9187 100644
--- a/custom_formats/Paramount+.yml
+++ b/custom_formats/Paramount+.yml
@@ -3,7 +3,6 @@ description: Matches 'Paramount+' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB2 [1080p]
 conditions:
 - name: PMTP Regex
   negate: false
diff --git a/custom_formats/Peacock.yml b/custom_formats/Peacock.yml
index fbca31e..d4938a3 100644
--- a/custom_formats/Peacock.yml
+++ b/custom_formats/Peacock.yml
@@ -3,7 +3,6 @@ description: Matches 'Peacock' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB2 [1080p]
 conditions:
 - name: PCOK Regex
   negate: false
diff --git a/custom_formats/Roku.yml b/custom_formats/Roku.yml
index c6e837c..75b6565 100644
--- a/custom_formats/Roku.yml
+++ b/custom_formats/Roku.yml
@@ -3,7 +3,6 @@ description: Matches 'Roku' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB3 [1080p]
 conditions:
 - name: Roku Regex
   negate: false
diff --git a/custom_formats/SD Quality Tier 1.yml b/custom_formats/SD Quality Tier 1.yml
index 2c9d28f..804c5b3 100644
--- a/custom_formats/SD Quality Tier 1.yml	
+++ b/custom_formats/SD Quality Tier 1.yml	
@@ -3,8 +3,8 @@ description: Matches release groups who fall under SD GPPi Tier 1
 tags:
 - GPPi
 - Release Group Tier
-- Quality
 - SD
+- Quality
 conditions:
 - name: DVD
   negate: false
diff --git a/custom_formats/SD Quality Tier 2.yml b/custom_formats/SD Quality Tier 2.yml
index 52f27a7..be8f62d 100644
--- a/custom_formats/SD Quality Tier 2.yml	
+++ b/custom_formats/SD Quality Tier 2.yml	
@@ -3,8 +3,8 @@ description: Matches release groups who fall under SD GPPi Tier 2
 tags:
 - GPPi
 - Release Group Tier
-- Quality
 - SD
+- Quality
 conditions:
 - name: DVD
   negate: false
diff --git a/custom_formats/iTunes (Missing).yml b/custom_formats/iTunes (Missing).yml
index 67ba291..1f0ec86 100644
--- a/custom_formats/iTunes (Missing).yml	
+++ b/custom_formats/iTunes (Missing).yml	
@@ -5,7 +5,6 @@ description: 'Matches ''iTunes'' WEB-DLs that are not labelled correctly. Matche
 tags:
 - Streaming Service
 - WEB-DL
-- WEB3 [1080p]
 conditions:
 - name: WEB-DL
   negate: false
diff --git a/custom_formats/iTunes.yml b/custom_formats/iTunes.yml
index f55897d..3811581 100644
--- a/custom_formats/iTunes.yml
+++ b/custom_formats/iTunes.yml
@@ -3,7 +3,6 @@ description: Matches 'iTunes' WEB-DLs. Negates any encodes.
 tags:
 - Streaming Service
 - WEB-DL
-- WEB3 [1080p]
 conditions:
 - name: iTunes Regex
   negate: false