diff --git a/custom_formats/Remux Tier 1.yml b/custom_formats/Remux Tier 1.yml
index 4662778..4182149 100644
--- a/custom_formats/Remux Tier 1.yml	
+++ b/custom_formats/Remux Tier 1.yml	
@@ -5,10 +5,15 @@ tags:
 - Remux
 conditions:
 - name: Remux
-  type: release_title
-  required: true
   negate: false
   pattern: Remux
+  required: true
+  type: release_title
+- name: Bluray
+  type: source
+  required: true
+  negate: false
+  source: bluray
 - name: 3L
   negate: false
   pattern: 3L
@@ -20,13 +25,13 @@ conditions:
   required: false
   type: release_group
 - name: CiNEPHiLES
-  type: release_group
-  required: false
   negate: false
   pattern: CiNEPHiLES
-- name: WiLDCAT
-  type: release_group
   required: false
+  type: release_group
+- name: WiLDCAT
   negate: false
   pattern: WiLDCAT
+  required: false
+  type: release_group
 tests: []
diff --git a/custom_formats/Remux.yml b/custom_formats/Remux.yml
index 803c197..fba03b5 100644
--- a/custom_formats/Remux.yml
+++ b/custom_formats/Remux.yml
@@ -8,9 +8,9 @@ conditions:
   pattern: Remux
   required: true
   type: release_title
-- name: Not DVD
-  type: source
+- name: Bluray
+  negate: false
   required: true
-  negate: true
-  source: dvd
+  source: bluray
+  type: source
 tests: []
diff --git a/custom_formats/Unwanted Remux Groups.yml b/custom_formats/Unwanted Remux Groups.yml
index ee2b1f0..664dd31 100644
--- a/custom_formats/Unwanted Remux Groups.yml	
+++ b/custom_formats/Unwanted Remux Groups.yml	
@@ -10,11 +10,16 @@ conditions:
   pattern: Remux
   required: true
   type: release_title
+- name: Bluray
+  type: source
+  required: true
+  negate: false
+  source: bluray
 - name: LEGi0N
-  type: release_group
-  required: false
   negate: false
   pattern: LEGi0N
+  required: false
+  type: release_group
 - name: RARGB
   negate: false
   pattern: RARGB