diff --git a/custom_formats/3D.yml b/custom_formats/3D.yml
index 1fcf90f..d369413 100644
--- a/custom_formats/3D.yml
+++ b/custom_formats/3D.yml
@@ -1,8 +1,8 @@
 name: 3D
 description: Matches the '3D' Regex Pattern
 tags:
-- Enhancement
 - Unwanted
+- Enhancement
 conditions:
 - name: 3D
   negate: false
diff --git a/custom_formats/Non Retail HDR.yml b/custom_formats/Non Retail HDR.yml
index 51b34ad..af20c38 100644
--- a/custom_formats/Non Retail HDR.yml	
+++ b/custom_formats/Non Retail HDR.yml	
@@ -1,8 +1,8 @@
 name: Non Retail HDR
 description: 'Matches groups who produce non-retail HDR10+ or Dolby Vision. '
 tags:
-- Release Group
 - Unwanted
+- Release Group
 conditions:
 - name: HDR10+ or DoVi
   negate: false
diff --git a/custom_formats/Special Edition (Unwanted).yml b/custom_formats/Special Edition (Unwanted).yml
index 2dd853f..10c4e9d 100644
--- a/custom_formats/Special Edition (Unwanted).yml	
+++ b/custom_formats/Special Edition (Unwanted).yml	
@@ -6,8 +6,8 @@ description: 'Matches Special Edition only for specific movies where the theatri
   - **Note:** This custom format doesn''t work because release titles only match after
   the parsed movie title: https://github.com/Radarr/Radarr/issues/4859'
 tags:
-- Edition
 - Unwanted
+- Edition
 conditions:
 - name: Special Edition
   negate: false
diff --git a/custom_formats/Unwanted Release Groups.yml b/custom_formats/Unwanted Release Groups.yml
index 0637744..1e0bd0e 100644
--- a/custom_formats/Unwanted Release Groups.yml	
+++ b/custom_formats/Unwanted Release Groups.yml	
@@ -1,8 +1,8 @@
 name: Unwanted Release Groups
 description: Matches Release Groups that are Banned
 tags:
-- Release Group
 - Unwanted
+- Release Group
 conditions:
 - name: Release Group (Missing)
   negate: true
@@ -60,10 +60,10 @@ conditions:
   required: false
   type: release_group
 - name: KC
-  type: release_group
-  required: false
   negate: false
   pattern: KC
+  required: false
+  type: release_group
 - name: LAMA
   negate: false
   pattern: LAMA
diff --git a/custom_formats/Unwanted Remux Groups.yml b/custom_formats/Unwanted Remux Groups.yml
index 17fbc76..27b0cf8 100644
--- a/custom_formats/Unwanted Remux Groups.yml	
+++ b/custom_formats/Unwanted Remux Groups.yml	
@@ -2,12 +2,12 @@ name: Unwanted Remux Groups
 description: Matches otherwise unfavourable remux groups - bloated audio tracks, fake
   HDR, etc.
 tags:
-- Release Group
 - Unwanted
+- Release Group
 conditions:
 - name: Bloated Remux Groups
-  type: release_title
-  required: false
   negate: false
   pattern: Bloated Remux Groups
+  required: false
+  type: release_title
 tests: []
diff --git a/custom_formats/Unwanted WEBRip.yml b/custom_formats/Unwanted WEBRip Groups.yml
similarity index 99%
rename from custom_formats/Unwanted WEBRip.yml
rename to custom_formats/Unwanted WEBRip Groups.yml
index 7e4cb01..51d7904 100644
--- a/custom_formats/Unwanted WEBRip.yml	
+++ b/custom_formats/Unwanted WEBRip Groups.yml	
@@ -1,4 +1,4 @@
-name: Unwanted WEBRip
+name: Unwanted WEBRip Groups
 description: Matches WEBRip releases that are not from a quality tier
 tags:
 - Release Group
diff --git a/custom_formats/Upscaled.yml b/custom_formats/Upscaled.yml
index 40c0d69..3aec808 100644
--- a/custom_formats/Upscaled.yml
+++ b/custom_formats/Upscaled.yml
@@ -1,12 +1,12 @@
 name: Upscaled
 description: Matches the 'Upscaled' regex pattern
 tags:
-- Enhancement
 - Unwanted
+- Enhancement
 conditions:
 - name: Upscaled
-  type: release_title
-  required: true
   negate: false
   pattern: Upscaled
+  required: true
+  type: release_title
 tests: []