diff --git a/custom_formats/HDR10 (Missing) (1080p).yml b/custom_formats/HDR10 (Missing) (1080p).yml
index 66d158b..3dc3d1f 100644
--- a/custom_formats/HDR10 (Missing) (1080p).yml	
+++ b/custom_formats/HDR10 (Missing) (1080p).yml	
@@ -4,16 +4,16 @@ tags:
 - Colour Grade
 - HDR
 conditions:
-- name: Blu-ray
-  type: source
-  required: true
-  negate: false
-  source: bluray
 - name: 1080p
   negate: false
   required: true
   resolution: 1080p
   type: resolution
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
 - name: Dolby Vision
   negate: false
   pattern: Dolby Vision
@@ -29,9 +29,9 @@ conditions:
   pattern: SDR
   required: true
   type: release_title
-- name: Not HDR10+
+- name: Not HDR
   negate: true
-  pattern: HDR10+
+  pattern: HDR
   required: true
   type: release_title
 - name: Not HDR10
@@ -39,9 +39,9 @@ conditions:
   pattern: HDR10
   required: true
   type: release_title
-- name: Not HDR
+- name: Not HDR10+
   negate: true
-  pattern: HDR
+  pattern: HDR10+
   required: true
   type: release_title
 tests: []
diff --git a/custom_formats/HDR10 (Missing).yml b/custom_formats/HDR10 (Missing).yml
index dffb2cd..d6c8c0d 100644
--- a/custom_formats/HDR10 (Missing).yml	
+++ b/custom_formats/HDR10 (Missing).yml	
@@ -5,16 +5,26 @@ tags:
 - Colour Grade
 - HDR
 conditions:
-- name: Blu-ray
-  negate: false
-  required: true
-  source: bluray
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Not SDR
+  negate: true
+  pattern: SDR
+  required: true
+  type: release_title
+- name: Not HDR
+  negate: true
+  pattern: HDR
+  required: true
+  type: release_title
 - name: Not HDR10
   negate: true
   pattern: HDR10
@@ -25,16 +35,6 @@ conditions:
   pattern: HDR10+
   required: true
   type: release_title
-- name: Not SDR
-  negate: true
-  pattern: SDR
-  required: true
-  type: release_title
-- name: Not HDR
-  type: release_title
-  required: true
-  negate: true
-  pattern: HDR
 tests:
 - conditionResults:
   - matches: false
diff --git a/custom_formats/SDR.yml b/custom_formats/SDR.yml
index b1545b8..c36d101 100644
--- a/custom_formats/SDR.yml
+++ b/custom_formats/SDR.yml
@@ -14,6 +14,16 @@ conditions:
   required: true
   source: web_dl
   type: source
+- name: Not HDR
+  negate: true
+  pattern: HDR
+  required: true
+  type: release_title
+- name: Not HDR10
+  negate: true
+  pattern: HDR10
+  required: true
+  type: release_title
 - name: Not HDR10+
   negate: true
   pattern: HDR10+
@@ -24,14 +34,4 @@ conditions:
   pattern: Dolby Vision
   required: true
   type: release_title
-- name: Not HDR10
-  negate: true
-  pattern: HDR10
-  required: true
-  type: release_title
-- name: Not HDR
-  type: release_title
-  required: true
-  negate: true
-  pattern: HDR
 tests: []