diff --git a/custom_formats/2160p Quality Tier 1.yml b/custom_formats/2160p Quality Tier 1.yml
index 7594aaf..e8f4b8f 100644
--- a/custom_formats/2160p Quality Tier 1.yml	
+++ b/custom_formats/2160p Quality Tier 1.yml	
@@ -15,11 +15,6 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: b0mbardiers
-  negate: false
-  pattern: b0mbardiers
-  required: false
-  type: release_group
 - name: CtrlHD
   negate: false
   pattern: CtrlHD
diff --git a/custom_formats/2160p Quality Tier 2.yml b/custom_formats/2160p Quality Tier 2.yml
index 2212cfb..f4adb3b 100644
--- a/custom_formats/2160p Quality Tier 2.yml	
+++ b/custom_formats/2160p Quality Tier 2.yml	
@@ -15,11 +15,6 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: BSTD
-  negate: false
-  pattern: BSTD
-  required: false
-  type: release_group
 - name: c0kE
   negate: false
   pattern: c0kE
diff --git a/custom_formats/2160p Quality Tier 3.yml b/custom_formats/2160p Quality Tier 3.yml
index b24f4f4..aaf8d2a 100644
--- a/custom_formats/2160p Quality Tier 3.yml	
+++ b/custom_formats/2160p Quality Tier 3.yml	
@@ -25,11 +25,6 @@ conditions:
   pattern: DEFLATE
   required: false
   type: release_group
-- name: JustWatch
-  negate: false
-  pattern: JustWatch
-  required: false
-  type: release_group
 - name: Kitsune
   negate: false
   pattern: Kitsune
@@ -50,9 +45,4 @@ conditions:
   pattern: SURCODE
   required: false
   type: release_group
-- name: TnP
-  negate: false
-  pattern: TnP
-  required: false
-  type: release_group
 tests: []
diff --git a/custom_formats/2160p Quality Tier 4.yml b/custom_formats/2160p Quality Tier 4.yml
index 14d2c46..e3d8f30 100644
--- a/custom_formats/2160p Quality Tier 4.yml	
+++ b/custom_formats/2160p Quality Tier 4.yml	
@@ -20,11 +20,21 @@ conditions:
   pattern: 4KDVS
   required: false
   type: release_group
+- name: b0mbardiers
+  negate: false
+  pattern: b0mbardiers
+  required: false
+  type: release_group
 - name: BlzT
   negate: false
   pattern: BlzT
   required: false
   type: release_group
+- name: BSTD
+  negate: false
+  pattern: BSTD
+  required: false
+  type: release_group
 - name: IAMABLE
   negate: false
   pattern: IAMABLE
@@ -35,6 +45,11 @@ conditions:
   pattern: iFT
   required: false
   type: release_group
+- name: JustWatch
+  negate: false
+  pattern: JustWatch
+  required: false
+  type: release_group
 - name: NCmt
   negate: false
   pattern: NCmt
@@ -45,6 +60,11 @@ conditions:
   pattern: TDD
   required: false
   type: release_group
+- name: TnP
+  type: release_group
+  required: false
+  negate: false
+  pattern: TnP
 - name: WATCHABLE
   negate: false
   pattern: WATCHABLE