diff --git a/custom_formats/Blu-ray Remux.yml b/custom_formats/Blu-ray Remux.yml
index fa0a609..4813ef6 100644
--- a/custom_formats/Blu-ray Remux.yml	
+++ b/custom_formats/Blu-ray Remux.yml	
@@ -7,7 +7,7 @@ tags:
 - Lossless
 - Source
 conditions:
-- name: Blu-ray
+- name: Bluray
   negate: false
   required: true
   source: bluray
diff --git a/custom_formats/HDR10 (Missing).yml b/custom_formats/HDR10 (Missing).yml
index d44660a..975512a 100644
--- a/custom_formats/HDR10 (Missing).yml	
+++ b/custom_formats/HDR10 (Missing).yml	
@@ -9,11 +9,11 @@ conditions:
   required: true
   resolution: 2160p
   type: resolution
-- name: Blu-ray
-  type: source
-  required: true
+- name: Bluray
   negate: false
+  required: true
   source: bluray
+  type: source
 - name: Not HDR10
   negate: true
   pattern: HDR10
diff --git a/custom_formats/SD Golden Popcorn.yml b/custom_formats/SD Golden Popcorn.yml
index 331f76d..5e93126 100644
--- a/custom_formats/SD Golden Popcorn.yml	
+++ b/custom_formats/SD Golden Popcorn.yml	
@@ -4,25 +4,25 @@ tags:
 - Flag
 - Golden Popcorn
 conditions:
-- name: 360p
+- name: 576p
   negate: false
   required: false
-  resolution: 360p
-  type: resolution
-- name: 480p
-  negate: false
-  required: false
-  resolution: 480p
+  resolution: 576p
   type: resolution
 - name: 540p
   negate: false
   required: false
   resolution: 540p
   type: resolution
-- name: 576p
+- name: 480p
   negate: false
   required: false
-  resolution: 576p
+  resolution: 480p
+  type: resolution
+- name: 360p
+  negate: false
+  required: false
+  resolution: 360p
   type: resolution
 - flag: ptp_golden
   name: Golden Popcorn
diff --git a/custom_formats/Special Edition (Unwanted).yml b/custom_formats/Special Edition (Unwanted).yml
index 4da3707..2dd853f 100644
--- a/custom_formats/Special Edition (Unwanted).yml	
+++ b/custom_formats/Special Edition (Unwanted).yml	
@@ -14,6 +14,11 @@ conditions:
   pattern: Special Edition
   required: true
   type: release_title
+- name: Better Theatricals
+  negate: false
+  pattern: Better Theatricals
+  required: true
+  type: release_title
 - name: Not IMAX
   negate: true
   pattern: IMAX
@@ -39,11 +44,6 @@ conditions:
   pattern: Sing Along
   required: true
   type: release_title
-- name: Better Theatricals
-  negate: false
-  pattern: Better Theatricals
-  required: true
-  type: release_title
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/UHD Bluray (Missing).yml b/custom_formats/UHD Bluray (Missing).yml
index a93aa93..67ebac6 100644
--- a/custom_formats/UHD Bluray (Missing).yml	
+++ b/custom_formats/UHD Bluray (Missing).yml	
@@ -17,11 +17,11 @@ conditions:
   required: true
   type: release_title
 - name: Release Groups
-  type: release_group
-  required: true
   negate: false
   pattern: UHD Bluray (Missing Groups)
-- name: Not UHD Blu-ray
+  required: true
+  type: release_group
+- name: Not UHD Bluray
   negate: true
   pattern: UHD Blu-ray
   required: true
diff --git a/custom_formats/UHD Bluray.yml b/custom_formats/UHD Bluray.yml
index bf87f5b..9a79640 100644
--- a/custom_formats/UHD Bluray.yml	
+++ b/custom_formats/UHD Bluray.yml	
@@ -12,7 +12,7 @@ tags:
 - Storage
 - 2160p
 conditions:
-- name: UHD Blu-ray
+- name: UHD Bluray
   negate: false
   pattern: UHD Blu-ray
   required: true
diff --git a/custom_formats/h265.yml b/custom_formats/h265.yml
index bb44804..e2dd5c2 100644
--- a/custom_formats/h265.yml
+++ b/custom_formats/h265.yml
@@ -3,29 +3,29 @@ description: Matches 'h265' regex pattern.
 tags:
 - Codec
 conditions:
-- name: WEB
-  type: source
-  required: true
+- name: WEB-DL
   negate: false
+  required: true
   source: web_dl
+  type: source
 - name: h265
   negate: false
   pattern: h265
   required: true
   type: release_title
 - name: Not Full Disc
-  type: release_title
-  required: true
   negate: true
   pattern: Full Disc
-- name: Not Remux
-  type: release_title
   required: true
+  type: release_title
+- name: Not Remux
   negate: true
   pattern: Remux
-- name: Not 4K
-  type: resolution
   required: true
+  type: release_title
+- name: Not 4K
   negate: true
+  required: true
   resolution: 2160p
+  type: resolution
 tests: []