diff --git a/custom_formats/TRaSH Anime BD Tier 02.yml b/custom_formats/TRaSH Anime BD Tier 02.yml
index 780b7ab..887a827 100644
--- a/custom_formats/TRaSH Anime BD Tier 02.yml	
+++ b/custom_formats/TRaSH Anime BD Tier 02.yml	
@@ -11,19 +11,14 @@ conditions:
   required: false
   source: bluray
   type: source
-- name: Bluray Remux
-  negate: false
-  required: false
-  source: bluray_remux
-  type: source
 - name: DVD
   negate: false
   required: false
   source: dvd
   type: source
-- name: 0x539
+- name: '0x539'
   negate: false
-  pattern: 0x539
+  pattern: '0x539'
   required: false
   type: release_title
 - name: Alt
diff --git a/custom_formats/TRaSH Anime BD Tier 03.yml b/custom_formats/TRaSH Anime BD Tier 03.yml
index dd91652..c6f691f 100644
--- a/custom_formats/TRaSH Anime BD Tier 03.yml	
+++ b/custom_formats/TRaSH Anime BD Tier 03.yml	
@@ -11,11 +11,6 @@ conditions:
   required: false
   source: bluray
   type: source
-- name: Bluray Remux
-  negate: false
-  required: false
-  source: bluray_remux
-  type: source
 - name: DVD
   negate: false
   required: false
diff --git a/custom_formats/TRaSH Anime BD Tier 04.yml b/custom_formats/TRaSH Anime BD Tier 04.yml
index 036e932..260c474 100644
--- a/custom_formats/TRaSH Anime BD Tier 04.yml	
+++ b/custom_formats/TRaSH Anime BD Tier 04.yml	
@@ -11,11 +11,6 @@ conditions:
   required: false
   source: bluray
   type: source
-- name: Bluray Remux
-  negate: false
-  required: false
-  source: bluray_remux
-  type: source
 - name: DVD
   negate: false
   required: false
diff --git a/custom_formats/TRaSH Anime BD Tier 05.yml b/custom_formats/TRaSH Anime BD Tier 05.yml
index c335d34..7aeb5d8 100644
--- a/custom_formats/TRaSH Anime BD Tier 05.yml	
+++ b/custom_formats/TRaSH Anime BD Tier 05.yml	
@@ -11,11 +11,6 @@ conditions:
   required: false
   source: bluray
   type: source
-- name: Bluray Remux
-  negate: false
-  required: false
-  source: bluray_remux
-  type: source
 - name: DVD
   negate: false
   required: false
diff --git a/custom_formats/TRaSH Anime BD Tier 06.yml b/custom_formats/TRaSH Anime BD Tier 06.yml
index a144b01..0f5d596 100644
--- a/custom_formats/TRaSH Anime BD Tier 06.yml	
+++ b/custom_formats/TRaSH Anime BD Tier 06.yml	
@@ -11,11 +11,6 @@ conditions:
   required: false
   source: bluray
   type: source
-- name: Bluray Remux
-  negate: false
-  required: false
-  source: bluray_remux
-  type: source
 - name: DVD
   negate: false
   required: false
diff --git a/custom_formats/TRaSH Anime BD Tier 07.yml b/custom_formats/TRaSH Anime BD Tier 07.yml
index bcd9337..0f75a60 100644
--- a/custom_formats/TRaSH Anime BD Tier 07.yml	
+++ b/custom_formats/TRaSH Anime BD Tier 07.yml	
@@ -12,11 +12,6 @@ conditions:
   required: false
   source: bluray
   type: source
-- name: Bluray Remux
-  negate: false
-  required: false
-  source: bluray_remux
-  type: source
 - name: DVD
   negate: false
   required: false
diff --git a/custom_formats/TRaSH Anime LQ Groups.yml b/custom_formats/TRaSH Anime LQ Groups.yml
index 8144d47..3664207 100644
--- a/custom_formats/TRaSH Anime LQ Groups.yml	
+++ b/custom_formats/TRaSH Anime LQ Groups.yml	
@@ -15,9 +15,9 @@ conditions:
   pattern: 0neshot
   required: false
   type: release_title
-- name: 224
+- name: '224'
   negate: false
-  pattern: 224
+  pattern: '224'
   required: false
   type: release_title
 - name: A-Destiny
@@ -487,7 +487,7 @@ conditions:
   type: release_title
 - name: Raw Files
   negate: false
-  pattern: M2TS|BDMV|BDVD
+  pattern: 'Raw Files'
   required: false
   type: release_title
 - name: Raze
diff --git a/custom_formats/TRaSH Anime Web Tier 01 (Muxers).yml b/custom_formats/TRaSH Anime Web Tier 01 (Muxers).yml
index 6003e7e..fd1a4a0 100644
--- a/custom_formats/TRaSH Anime Web Tier 01 (Muxers).yml	
+++ b/custom_formats/TRaSH Anime Web Tier 01 (Muxers).yml	
@@ -14,12 +14,7 @@ conditions:
 - name: WEBRIP
   negate: false
   required: false
-  source: web_rip
-  type: source
-- name: WEB
-  negate: false
-  required: false
-  source: web
+  source: WEBRip
   type: source
 - name: Arg0
   negate: false
diff --git a/custom_formats/TRaSH Anime Web Tier 02 (Top FanSubs).yml b/custom_formats/TRaSH Anime Web Tier 02 (Top FanSubs).yml
index 02ccda9..5ce7a5f 100644
--- a/custom_formats/TRaSH Anime Web Tier 02 (Top FanSubs).yml	
+++ b/custom_formats/TRaSH Anime Web Tier 02 (Top FanSubs).yml	
@@ -14,16 +14,11 @@ conditions:
 - name: WEBRIP
   negate: false
   required: false
-  source: web_rip
+  source: WEBRip
   type: source
-- name: WEB
+- name: '0x539'
   negate: false
-  required: false
-  source: web
-  type: source
-- name: 0x539
-  negate: false
-  pattern: 0x539
+  pattern: '0x539'
   required: false
   type: release_title
 - name: Asakura
diff --git a/custom_formats/TRaSH Anime Web Tier 03 (Official Subs).yml b/custom_formats/TRaSH Anime Web Tier 03 (Official Subs).yml
index ac09970..5f03f28 100644
--- a/custom_formats/TRaSH Anime Web Tier 03 (Official Subs).yml	
+++ b/custom_formats/TRaSH Anime Web Tier 03 (Official Subs).yml	
@@ -14,12 +14,7 @@ conditions:
 - name: WEBRIP
   negate: false
   required: false
-  source: web_rip
-  type: source
-- name: WEB
-  negate: false
-  required: false
-  source: web
+  source: WEBRip
   type: source
 - name: SubsPlease
   negate: false
diff --git a/custom_formats/TRaSH Anime Web Tier 04 (Official Subs).yml b/custom_formats/TRaSH Anime Web Tier 04 (Official Subs).yml
index 8a469ce..cec74a4 100644
--- a/custom_formats/TRaSH Anime Web Tier 04 (Official Subs).yml	
+++ b/custom_formats/TRaSH Anime Web Tier 04 (Official Subs).yml	
@@ -14,12 +14,7 @@ conditions:
 - name: WEBRIP
   negate: false
   required: false
-  source: web_rip
-  type: source
-- name: WEB
-  negate: false
-  required: false
-  source: web
+  source: WEBRip
   type: source
 - name: BlueLobster
   negate: false
diff --git a/custom_formats/TRaSH HD Bluray Tier 01.yml b/custom_formats/TRaSH HD Bluray Tier 01.yml
index 3ae789e..959a591 100644
--- a/custom_formats/TRaSH HD Bluray Tier 01.yml	
+++ b/custom_formats/TRaSH HD Bluray Tier 01.yml	
@@ -11,15 +11,10 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: Not REMUX
-  negate: true
-  required: true
-  source: remux
-  type: source
 - name: Not 2160p
   negate: true
   required: true
-  resolution: 2160
+  resolution: 2160p
   type: resolution
 - name: Chotab
   negate: false
diff --git a/custom_formats/TRaSH HD Bluray Tier 02.yml b/custom_formats/TRaSH HD Bluray Tier 02.yml
index b49c4d0..594189d 100644
--- a/custom_formats/TRaSH HD Bluray Tier 02.yml	
+++ b/custom_formats/TRaSH HD Bluray Tier 02.yml	
@@ -11,24 +11,19 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: Not REMUX
-  negate: true
-  required: true
-  source: remux
-  type: source
 - name: Not 2160p
   negate: true
   required: true
-  resolution: 2160
+  resolution: 2160p
   type: resolution
 - name: SA89
   negate: false
   pattern: SA89
   required: false
   type: release_group
-- name: sbR
+- name: SbR
   negate: false
-  pattern: sbR
+  pattern: SbR
   required: false
   type: release_group
 tests: []
diff --git a/custom_formats/TRaSH Remux Tier 01.yml b/custom_formats/TRaSH Remux Tier 01.yml
index c3a1846..34c6a78 100644
--- a/custom_formats/TRaSH Remux Tier 01.yml	
+++ b/custom_formats/TRaSH Remux Tier 01.yml	
@@ -5,11 +5,6 @@ tags:
 - Tier 01
 - TRaSH
 conditions:
-- name: Remux
-  negate: false
-  required: true
-  source: remux
-  type: source
 - name: BLURANiUM
   negate: false
   pattern: BLURANiUM
diff --git a/custom_formats/TRaSH WEB Tier 01.yml b/custom_formats/TRaSH WEB Tier 01.yml
index c77f7a0..06e6c23 100644
--- a/custom_formats/TRaSH WEB Tier 01.yml	
+++ b/custom_formats/TRaSH WEB Tier 01.yml	
@@ -17,7 +17,7 @@ conditions:
   type: release_group
 - name: APEX
   negate: false
-  pattern: APEX|PAXA|PEXA|XEPA
+  pattern: APEX
   required: false
   type: release_group
 - name: CasStudio
@@ -108,6 +108,6 @@ conditions:
 - name: WEBRIP
   negate: false
   required: false
-  source: web_rip
+  source: WEBRip
   type: source
 tests: []
diff --git a/custom_formats/TRaSH WEB Tier 02.yml b/custom_formats/TRaSH WEB Tier 02.yml
index 371ee79..5a80b05 100644
--- a/custom_formats/TRaSH WEB Tier 02.yml	
+++ b/custom_formats/TRaSH WEB Tier 02.yml	
@@ -185,9 +185,9 @@ conditions:
   pattern: SDCC
   required: false
   type: release_group
-- name: SIGMA
+- name: SiGMA
   negate: false
-  pattern: SIGMA
+  pattern: SiGMA
   required: false
   type: release_group
 - name: SMURF
@@ -217,7 +217,7 @@ conditions:
   type: release_group
 - name: XEBEC
   negate: false
-  pattern: XEBEC|4KBEC|CEBEX
+  pattern: XEBEC
   required: false
   type: release_group
 - name: WEBDL
@@ -228,6 +228,6 @@ conditions:
 - name: WEBRIP
   negate: false
   required: false
-  source: web_rip
+  source: WEBRrip
   type: source
 tests: []
diff --git a/regex_patterns/ABBIE.yml b/regex_patterns/ABBIE.yml
index 1661e34..e3637f6 100644
--- a/regex_patterns/ABBIE.yml
+++ b/regex_patterns/ABBIE.yml
@@ -1,4 +1,4 @@
-name: ABBIE
+name: ABBiE
 pattern: (?<=^|[\s.-])ABBIE\b
 description: ''
 tags:
diff --git a/regex_patterns/BLURANiUM.yml b/regex_patterns/BLURANiUM.yml
new file mode 100644
index 0000000..2ceb158
--- /dev/null
+++ b/regex_patterns/BLURANiUM.yml
@@ -0,0 +1,6 @@
+name: BLURANiUM
+pattern: ^(BLURANiUM)$
+description: ''
+tags:
+- Release Group
+tests: []
diff --git a/regex_patterns/EPSiLON.yml b/regex_patterns/EPSiLON.yml
new file mode 100644
index 0000000..39cf41c
--- /dev/null
+++ b/regex_patterns/EPSiLON.yml
@@ -0,0 +1,6 @@
+name: EPSiLON
+pattern: ^(EPSiLON)$
+description: ''
+tags:
+- Release Group
+tests: []
diff --git a/regex_patterns/PmP.yml b/regex_patterns/PmP.yml
new file mode 100644
index 0000000..5b07fc2
--- /dev/null
+++ b/regex_patterns/PmP.yml
@@ -0,0 +1,6 @@
+name: 'PmP'
+pattern: ^(PmP)$
+description: ''
+tags:
+- Release Group
+tests: []
diff --git a/regex_patterns/Raw-Files.yml b/regex_patterns/Raw Files.yml
similarity index 100%
rename from regex_patterns/Raw-Files.yml
rename to regex_patterns/Raw Files.yml
diff --git a/regex_patterns/dB.yml b/regex_patterns/dB.yml
index b33f3e5..6ae3968 100644
--- a/regex_patterns/dB.yml
+++ b/regex_patterns/dB.yml
@@ -1,4 +1,4 @@
-name: 'DB'
+name: 'dB'
 pattern: \[DB\]
 description: ''
 tags: