diff --git a/custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml b/custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml
index bd6fa8a..1c60a5b 100644
--- a/custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml	
+++ b/custom_formats/1080p Efficient Bluray Tier 4 (Radarr).yml	
@@ -22,35 +22,40 @@ conditions:
   required: true
   type: release_title
 - name: Chivaman
-  type: release_group
-  required: false
   negate: false
   pattern: Chivaman
-- name: R1GY3B
+  required: false
+  type: release_group
+- name: edge2020
   type: release_group
   required: false
+  negate: false
+  pattern: edge2020
+- 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 3 (Radarr).yml b/custom_formats/1080p Efficient WEB Tier 3 (Radarr).yml
index c7db296..d4d2e9f 100644
--- a/custom_formats/1080p Efficient WEB Tier 3 (Radarr).yml	
+++ b/custom_formats/1080p Efficient WEB Tier 3 (Radarr).yml	
@@ -12,10 +12,10 @@ conditions:
   resolution: 1080p
   type: resolution
 - name: x265
-  type: release_title
-  required: true
   negate: false
   pattern: x265 (Efficient)
+  required: true
+  type: release_title
 - name: WEB-DL
   negate: false
   required: false
@@ -26,6 +26,11 @@ conditions:
   required: false
   source: webrip
   type: source
+- name: edge2020
+  type: release_group
+  required: false
+  negate: false
+  pattern: edge2020
 - name: SiGMA
   negate: false
   pattern: SiGMA
diff --git a/custom_formats/Banned Groups.yml b/custom_formats/Banned Groups.yml
index 7cec414..b58a259 100644
--- a/custom_formats/Banned Groups.yml	
+++ b/custom_formats/Banned Groups.yml	
@@ -54,11 +54,6 @@ conditions:
   pattern: DepraveD
   required: false
   type: release_group
-- name: edge2020
-  negate: false
-  pattern: edge2020
-  required: false
-  type: release_group
 - name: FGT
   negate: false
   pattern: FGT