diff --git a/regex_patterns/$tore-Chill.yml b/regex_patterns/$tore-Chill.yml
deleted file mode 100644
index 97eb67d..0000000
--- a/regex_patterns/$tore-Chill.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '$tore-Chill'
-pattern: \b(\$tore-Chill)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/0neshot.yml b/regex_patterns/0neshot.yml
deleted file mode 100644
index bf76cb5..0000000
--- a/regex_patterns/0neshot.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '0neshot'
-pattern: \b(0neshot)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/0x539.yml b/regex_patterns/0x539.yml
deleted file mode 100644
index 72344d1..0000000
--- a/regex_patterns/0x539.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '0x539'
-pattern: \b(0x539)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/10bit-HDS.yml b/regex_patterns/10bit-HDS.yml
deleted file mode 100644
index dfec5ba..0000000
--- a/regex_patterns/10bit-HDS.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 10bit-HDS
-pattern: (?<=^|[\s.-])10bit-HDS\b
-description: 'Matches the release group `10bit-HDS` only if it is:
-
-
-  - Preceded by the start of the string (`^`), a whitespace character (`\s`), a period
-  (`.`), or a hyphen (`-`).
-
-  - Followed by a word boundary (`\b`), ensuring it ends cleanly without being part
-  of a longer word. '
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/10bit.yml b/regex_patterns/10bit.yml
deleted file mode 100644
index e8fd939..0000000
--- a/regex_patterns/10bit.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '10bit'
-pattern: '10[.-]?bit'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/1XBET.yml b/regex_patterns/1XBET.yml
deleted file mode 100644
index 5912eca..0000000
--- a/regex_patterns/1XBET.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '1XBET'
-pattern: '\\b(1XBET)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/224.yml b/regex_patterns/224.yml
deleted file mode 100644
index b913a94..0000000
--- a/regex_patterns/224.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '224'
-pattern: \[224\]|-224\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/24xHD.yml b/regex_patterns/24xHD.yml
deleted file mode 100644
index f152966..0000000
--- a/regex_patterns/24xHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '24xHD'
-pattern: '\b(24xHD)\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/3D (1).yml b/regex_patterns/3D (1).yml
deleted file mode 100644
index 329154a..0000000
--- a/regex_patterns/3D (1).yml	
+++ /dev/null
@@ -1,49 +0,0 @@
-'description': 'Matches terms related to 3D video formats:
-
-  - `bluray3d` or `bd3d` (optional `bluray` or `bd` followed by `3d`).
-
-  - `sbs` (side-by-side).
-
-  - `half ou` or `half sbs` with space (` `), dot (`.`), or hyphen (`-`) as separators.'
-'name': '3D'
-'pattern': '(?<=\b[12]\d{3}\b).*\b((bluray|bd)?3d|sbs|half[ .-]ou|half[ .-]sbs)\b'
-'tags':
-- 'Enhancement'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Universal.Soldier.Day.of.Reckoning.2012.1080p.BluRay.3D.H-SBS.DTS.x264-BluRay3D'
-  'lastRun': '2025-04-25T14:15:46.876957'
-  'matchSpan':
-    'end': 55
-    'start': 53
-  'matchedContent': '3D'
-  'matchedGroups':
-  - '3D'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Justin.And.The.Knights.Of.Valour.3D.2013.1080p.BluRay.Half-SBS.x264-BluRay3D'
-  'lastRun': '2025-04-25T14:15:46.876957'
-  'matchSpan':
-    'end': 35
-    'start': 33
-  'matchedContent': '3D'
-  'matchedGroups':
-  - '3D'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Step Up 3D 2010 1080p BluRay DTS-ES 6.1 x264-xander'
-  'lastRun': '2025-04-25T14:15:46.876957'
-  'matchSpan':
-    'end': 10
-    'start': 8
-  'matchedContent': '3D'
-  'matchedGroups':
-  - '3D'
-  - null
-  'passes': false
diff --git a/regex_patterns/3D.yml b/regex_patterns/3D.yml
index 5fb3900..ad7ff86 100644
--- a/regex_patterns/3D.yml
+++ b/regex_patterns/3D.yml
@@ -1,5 +1,5 @@
 name: 3D
-pattern: \b((bluray|bd)?3d|sbs|half[ .-]ou|half[ .-]sbs)\b
+pattern: (?<=\b[12]\d{3}\b).*\b((bluray|bd)?3d|sbs|half[ .-]ou|half[ .-]sbs)\b
 description: 'Matches terms related to 3D video formats:
 
   - `bluray3d` or `bd3d` (optional `bluray` or `bd` followed by `3d`).
@@ -9,12 +9,12 @@ description: 'Matches terms related to 3D video formats:
   - `half ou` or `half sbs` with space (` `), dot (`.`), or hyphen (`-`) as separators.'
 tags:
 - Enhancement
-- Unwanted
+- UnWanted
 tests:
 - expected: true
   id: 1
   input: Universal.Soldier.Day.of.Reckoning.2012.1080p.BluRay.3D.H-SBS.DTS.x264-BluRay3D
-  lastRun: '2024-12-13T06:50:15.135830'
+  lastRun: '2025-04-25T14:15:46.876957'
   matchSpan:
     end: 55
     start: 53
@@ -26,7 +26,7 @@ tests:
 - expected: true
   id: 2
   input: Justin.And.The.Knights.Of.Valour.3D.2013.1080p.BluRay.Half-SBS.x264-BluRay3D
-  lastRun: '2024-12-13T06:50:15.135830'
+  lastRun: '2025-04-25T14:15:46.876957'
   matchSpan:
     end: 35
     start: 33
@@ -35,3 +35,15 @@ tests:
   - 3D
   - null
   passes: true
+- expected: false
+  id: 3
+  input: Step Up 3D 2010 1080p BluRay DTS-ES 6.1 x264-xander
+  lastRun: '2025-04-25T14:15:46.876957'
+  matchSpan:
+    end: 10
+    start: 8
+  matchedContent: 3D
+  matchedGroups:
+  - 3D
+  - null
+  passes: false
diff --git a/regex_patterns/3L.yml b/regex_patterns/3L.yml
index bfdc363..c9ea55c 100644
--- a/regex_patterns/3L.yml
+++ b/regex_patterns/3L.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': '3L'
-'pattern': '(?<=^|[\s.-])3L\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: 3L
+pattern: (?<=^|[\s.-])3L\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/3cTWeB.yml b/regex_patterns/3cTWeB.yml
deleted file mode 100644
index 3461662..0000000
--- a/regex_patterns/3cTWeB.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 3cTWeB
-pattern: ^(3cTWeB)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/41RGB.yml b/regex_patterns/41RGB.yml
deleted file mode 100644
index cdaf5c5..0000000
--- a/regex_patterns/41RGB.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: '41RGB'
-pattern: '^(41RGB)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/4K4U (1).yml b/regex_patterns/4K4U (1).yml
deleted file mode 100644
index a487961..0000000
--- a/regex_patterns/4K4U (1).yml	
+++ /dev/null
@@ -1,14 +0,0 @@
-'description': 'Matches the release group `4K4U` only if it is:
-
-
-  - Preceded by the start of the string (`^`), a whitespace character (`\s`), a period
-  (`.`), or a hyphen (`-`).
-
-  - Followed by a word boundary (`\b`), ensuring it ends cleanly without being part
-  of a longer word. '
-'name': '4K4U'
-'pattern': '(?<=^|[\s.-])4K4U\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/4K4U.yml b/regex_patterns/4K4U.yml
index f333f4b..30f47a1 100644
--- a/regex_patterns/4K4U.yml
+++ b/regex_patterns/4K4U.yml
@@ -10,4 +10,5 @@ description: 'Matches the release group `4K4U` only if it is:
   of a longer word. '
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/4KDVS (1).yml b/regex_patterns/4KDVS (1).yml
deleted file mode 100644
index f40aec5..0000000
--- a/regex_patterns/4KDVS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "4KDVS" when preceded by whitespace, a hyphen or dot'
-'name': '4KDVS'
-'pattern': '(?<=^|[\s.-])4KDVS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/4KDVS.yml b/regex_patterns/4KDVS.yml
index dc96bd4..30b89aa 100644
--- a/regex_patterns/4KDVS.yml
+++ b/regex_patterns/4KDVS.yml
@@ -1,6 +1,7 @@
 name: 4KDVS
 pattern: (?<=^|[\s.-])4KDVS\b
-description: 'Matches "4KDVS" when preceded by whitespace, a hyphen or dot'
+description: Matches "4KDVS" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/7.1 Surround (1).yml b/regex_patterns/7.1 Surround (1).yml
deleted file mode 100644
index abfe6d6..0000000
--- a/regex_patterns/7.1 Surround (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': '7.1 Surround'
-'pattern': '7\.1'
-'tags':
-- 'Audio'
-- 'Channel'
-'tests': []
diff --git a/regex_patterns/9volt (1).yml b/regex_patterns/9volt (1).yml
deleted file mode 100644
index 90f81f3..0000000
--- a/regex_patterns/9volt (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': '9volt'
-'pattern': '(?<=^|[\s.-])9volt\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/9volt.yml b/regex_patterns/9volt.yml
index bbffabd..63ea7be 100644
--- a/regex_patterns/9volt.yml
+++ b/regex_patterns/9volt.yml
@@ -1,6 +1,7 @@
-name: '9volt'
-pattern: \b(9volt)\b
+name: 9volt
+pattern: (?<=^|[\s.-])9volt\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/A-Destiny.yml b/regex_patterns/A-Destiny.yml
deleted file mode 100644
index 0af9ff7..0000000
--- a/regex_patterns/A-Destiny.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'A-Destiny'
-pattern: \b(A-Destiny)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/A-L.yml b/regex_patterns/A-L.yml
deleted file mode 100644
index c7d9f88..0000000
--- a/regex_patterns/A-L.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'A-L'
-pattern: \b(A-L)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AAAUHD (1).yml b/regex_patterns/AAAUHD (1).yml
deleted file mode 100644
index f7ab286..0000000
--- a/regex_patterns/AAAUHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'AAAUHD'
-'pattern': '(?<=^|[\s.-])AAAUHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/AAAUHD.yml b/regex_patterns/AAAUHD.yml
index 5543fd1..63f6eb8 100644
--- a/regex_patterns/AAAUHD.yml
+++ b/regex_patterns/AAAUHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])AAAUHD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/AAC (1).yml b/regex_patterns/AAC (1).yml
deleted file mode 100644
index 2db65fd..0000000
--- a/regex_patterns/AAC (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'AAC'
-'pattern': '\bAAC(\b|\d)'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/AAC.yml b/regex_patterns/AAC.yml
index 3fa9a37..2732c45 100644
--- a/regex_patterns/AAC.yml
+++ b/regex_patterns/AAC.yml
@@ -2,5 +2,5 @@ name: AAC
 pattern: \bAAC(\b|\d)
 description: ''
 tags:
-- Release Group
+- Audio
 tests: []
diff --git a/regex_patterns/ABBIE (1).yml b/regex_patterns/ABBIE (1).yml
deleted file mode 100644
index d436d82..0000000
--- a/regex_patterns/ABBIE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ABBIE'
-'pattern': '(?<=^|[\s.-])ABBIE\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/ABBIE.yml b/regex_patterns/ABBIE.yml
index e3637f6..7c134db 100644
--- a/regex_patterns/ABBIE.yml
+++ b/regex_patterns/ABBIE.yml
@@ -1,6 +1,7 @@
-name: ABBiE
+name: ABBIE
 pattern: (?<=^|[\s.-])ABBIE\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/AC (1).yml b/regex_patterns/AC (1).yml
deleted file mode 100644
index e9412bf..0000000
--- a/regex_patterns/AC (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'AC'
-'pattern': '(?<=^|[\s.-])AC\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/AC.yml b/regex_patterns/AC.yml
index 82a14e6..00755c9 100644
--- a/regex_patterns/AC.yml
+++ b/regex_patterns/AC.yml
@@ -1,6 +1,7 @@
-name: 'AC'
-pattern: \[AC\]|-AC$
+name: AC
+pattern: (?<=^|[\s.-])AC\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/ADE (1).yml b/regex_patterns/ADE (1).yml
deleted file mode 100644
index 3f07e06..0000000
--- a/regex_patterns/ADE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ADE'
-'pattern': '(?<=^|[\s.-])ADE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ADE.yml b/regex_patterns/ADE.yml
index 503af31..8eea7f2 100644
--- a/regex_patterns/ADE.yml
+++ b/regex_patterns/ADE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ADE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/AJP69 (1).yml b/regex_patterns/AJP69 (1).yml
deleted file mode 100644
index c13dbc0..0000000
--- a/regex_patterns/AJP69 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'AJP69'
-'pattern': '(?<=^|[\s.-])AJP69\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/AJP69.yml b/regex_patterns/AJP69.yml
index 082fe82..42a7bfa 100644
--- a/regex_patterns/AJP69.yml
+++ b/regex_patterns/AJP69.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])AJP69\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/ANE (1).yml b/regex_patterns/ANE (1).yml
deleted file mode 100644
index cc44da9..0000000
--- a/regex_patterns/ANE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ANE'
-'pattern': '(?<=^|[\s.-])ANE\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/ANE.yml b/regex_patterns/ANE.yml
index 3d74872..7267065 100644
--- a/regex_patterns/ANE.yml
+++ b/regex_patterns/ANE.yml
@@ -1,6 +1,7 @@
-name: 'ANE'
-pattern: \[ANE\]|-ANE$
+name: ANE
+pattern: (?<=^|[\s.-])ANE\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/ANThELIa.yml b/regex_patterns/ANThELIa.yml
deleted file mode 100644
index 11fd92c..0000000
--- a/regex_patterns/ANThELIa.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ANThELIa'
-pattern: \b(ANThELIa)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/ANiHLS.yml b/regex_patterns/ANiHLS.yml
deleted file mode 100644
index 31ed1c2..0000000
--- a/regex_patterns/ANiHLS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ANiHLS'
-pattern: \b(ANiHLS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AOmundson (1).yml b/regex_patterns/AOmundson (1).yml
deleted file mode 100644
index 185df2b..0000000
--- a/regex_patterns/AOmundson (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'AOmundson'
-'pattern': '(?<=^|[\s.-])AOmundson\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/AOmundson.yml b/regex_patterns/AOmundson.yml
index 3b3fc9a..08e7291 100644
--- a/regex_patterns/AOmundson.yml
+++ b/regex_patterns/AOmundson.yml
@@ -1,6 +1,7 @@
-name: 'AOmundson'
-pattern: \b(AOmundson)\b
+name: AOmundson
+pattern: (?<=^|[\s.-])AOmundson\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/AP.yml b/regex_patterns/AP.yml
deleted file mode 100644
index 45469e0..0000000
--- a/regex_patterns/AP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AP'
-pattern: \b(AP)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/APEX (1).yml b/regex_patterns/APEX (1).yml
deleted file mode 100644
index c5465a5..0000000
--- a/regex_patterns/APEX (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'APEX'
-'pattern': '(?<=^|[\s.-])APEX\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/APEX.yml b/regex_patterns/APEX.yml
index 0caa48f..824c2d0 100644
--- a/regex_patterns/APEX.yml
+++ b/regex_patterns/APEX.yml
@@ -1,7 +1,7 @@
-name: 'APEX'
-pattern: "^(APEX|PAXA|PEXA|XEPA)$"
+name: APEX
+pattern: (?<=^|[\s.-])APEX\b
 description: ''
 tags:
 - Release Group
-- TRaSH
+- WEB-DL
 tests: []
diff --git a/regex_patterns/ARC.yml b/regex_patterns/ARC.yml
deleted file mode 100644
index 7c026f2..0000000
--- a/regex_patterns/ARC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ARC
-pattern: \[ARC\]|-ARC\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AREY.yml b/regex_patterns/AREY.yml
deleted file mode 100644
index 62faca9..0000000
--- a/regex_patterns/AREY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AREY'
-pattern: \b(AREY)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AROMA (1).yml b/regex_patterns/AROMA (1).yml
deleted file mode 100644
index 469deca..0000000
--- a/regex_patterns/AROMA (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Retagging'
-'name': 'AROMA'
-'pattern': '(?<=^|[\s.-])AROMA\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/AROMA.yml b/regex_patterns/AROMA.yml
index 2ea4281..c629ba8 100644
--- a/regex_patterns/AROMA.yml
+++ b/regex_patterns/AROMA.yml
@@ -1,6 +1,7 @@
-name: 'AROMA'
-pattern: '^(AROMA)$'
-description: ''
+name: AROMA
+pattern: (?<=^|[\s.-])AROMA\b
+description: Banned for Retagging
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/ASC.yml b/regex_patterns/ASC.yml
deleted file mode 100644
index 0300919..0000000
--- a/regex_patterns/ASC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ASC'
-pattern: \b(ASC)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ASO.yml b/regex_patterns/ASO.yml
deleted file mode 100644
index a1dd37b..0000000
--- a/regex_patterns/ASO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ASO'
-pattern: \b(ASO)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ASW.yml b/regex_patterns/ASW.yml
deleted file mode 100644
index 2da1600..0000000
--- a/regex_patterns/ASW.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ASW'
-pattern: \b(ASW)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ATELiER.yml b/regex_patterns/ATELiER.yml
deleted file mode 100644
index 230c635..0000000
--- a/regex_patterns/ATELiER.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ATELiER'
-pattern: '^(ATELiER)$'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/AV1 (1).yml b/regex_patterns/AV1 (1).yml
deleted file mode 100644
index 9cfd8b2..0000000
--- a/regex_patterns/AV1 (1).yml	
+++ /dev/null
@@ -1,29 +0,0 @@
-'description': 'AV1, or AOMedia Video 1, is a video coding format that compresses
-  video files and streams while maintaining high quality.'
-'name': 'AV1'
-'pattern': '\b(AV1)\b'
-'tags':
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Arcane S01 2160p UHD BluRay DD 5.1 DV HDR AV1-TiZU'
-  'lastRun': '2025-04-15T14:50:05.552676'
-  'matchSpan':
-    'end': 45
-    'start': 42
-  'matchedContent': 'AV1'
-  'matchedGroups':
-  - 'AV1'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Up.2009.2160p.Bluray.AC3.HDR.DV.AV1-TiZU.mkv'
-  'lastRun': '2025-04-15T14:50:05.552676'
-  'matchSpan':
-    'end': 35
-    'start': 32
-  'matchedContent': 'AV1'
-  'matchedGroups':
-  - 'AV1'
-  'passes': true
diff --git a/regex_patterns/AV1.yml b/regex_patterns/AV1.yml
index fe32b11..dc61ce9 100644
--- a/regex_patterns/AV1.yml
+++ b/regex_patterns/AV1.yml
@@ -1,5 +1,5 @@
 name: AV1
-pattern: \bAV1\b
+pattern: \b(AV1)\b
 description: AV1, or AOMedia Video 1, is a video coding format that compresses video
   files and streams while maintaining high quality.
 tags:
@@ -8,20 +8,22 @@ tests:
 - expected: true
   id: 1
   input: Arcane S01 2160p UHD BluRay DD 5.1 DV HDR AV1-TiZU
-  lastRun: '2024-12-13T07:04:08.442964'
+  lastRun: '2025-04-15T14:50:05.552676'
   matchSpan:
     end: 45
     start: 42
   matchedContent: AV1
-  matchedGroups: []
+  matchedGroups:
+  - AV1
   passes: true
 - expected: true
   id: 2
   input: Up.2009.2160p.Bluray.AC3.HDR.DV.AV1-TiZU.mkv
-  lastRun: '2024-12-13T07:04:08.442964'
+  lastRun: '2025-04-15T14:50:05.552676'
   matchSpan:
     end: 35
     start: 32
   matchedContent: AV1
-  matchedGroups: []
+  matchedGroups:
+  - AV1
   passes: true
diff --git a/regex_patterns/AViATOR (1).yml b/regex_patterns/AViATOR (1).yml
deleted file mode 100644
index 9b33051..0000000
--- a/regex_patterns/AViATOR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'AViATOR'
-'pattern': '(?<=^|[\s.-])AViATOR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/AViATOR.yml b/regex_patterns/AViATOR.yml
index 768bad5..53b84a4 100644
--- a/regex_patterns/AViATOR.yml
+++ b/regex_patterns/AViATOR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])AViATOR\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/AZAZE.yml b/regex_patterns/AZAZE.yml
deleted file mode 100644
index 2069357..0000000
--- a/regex_patterns/AZAZE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AZAZE'
-pattern: '^(AZAZE)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Absinth (1).yml b/regex_patterns/Absinth (1).yml
deleted file mode 100644
index ba4c15a..0000000
--- a/regex_patterns/Absinth (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Absinth'
-'pattern': '(?<=^|[\s.-])Absinth\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Absinth.yml b/regex_patterns/Absinth.yml
index ad54497..4bd7952 100644
--- a/regex_patterns/Absinth.yml
+++ b/regex_patterns/Absinth.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Absinth\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/AceAres.yml b/regex_patterns/AceAres.yml
deleted file mode 100644
index be052d1..0000000
--- a/regex_patterns/AceAres.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AceAres'
-pattern: \b(AceAres)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Aergia.yml b/regex_patterns/Aergia.yml
deleted file mode 100644
index 95902b1..0000000
--- a/regex_patterns/Aergia.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Aergia
-pattern: \[Aergia\]|-Aergia(?!-raws)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Afro.yml b/regex_patterns/Afro.yml
deleted file mode 100644
index be8999f..0000000
--- a/regex_patterns/Afro.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Afro'
-pattern: \[Afro\]|-Afro\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AhmadDev.yml b/regex_patterns/AhmadDev.yml
deleted file mode 100644
index 060c3a7..0000000
--- a/regex_patterns/AhmadDev.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AhmadDev'
-pattern: \b(AhmadDev)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Akai.yml b/regex_patterns/Akai.yml
deleted file mode 100644
index 054a18b..0000000
--- a/regex_patterns/Akai.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Akai'
-pattern: \[Akai\]|-Akai\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Almighty.yml b/regex_patterns/Almighty.yml
deleted file mode 100644
index b02e970..0000000
--- a/regex_patterns/Almighty.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Almighty'
-pattern: \[Almighty\]|-Almighty\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Alt.yml b/regex_patterns/Alt.yml
deleted file mode 100644
index 34c26af..0000000
--- a/regex_patterns/Alt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Alt
-pattern: \[Alt\]|-Alt\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Amazon Prime (1).yml b/regex_patterns/Amazon Prime (1).yml
deleted file mode 100644
index 0718149..0000000
--- a/regex_patterns/Amazon Prime (1).yml	
+++ /dev/null
@@ -1,53 +0,0 @@
-'description': 'Amazon Prime Video, or simply Prime Video, is an American subscription
-  video on-demand over-the-top streaming and rental service of Amazon offered both
-  as a stand-alone service and as part of Amazon''s Prime subscription.'
-'name': 'Amazon Prime'
-'pattern': '\b(?:amzn|(?:AMZN|Amazon)(?=\s*(?:WEB-?DL|HD)))\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Futurama.S03E01.Amazon Women in the Mood.1080p.AMZN.WEB-DL.DDP2.0.H.264-Yatogam1.mkv'
-  'lastRun': '2024-12-06T01:59:08.829137'
-  'matchSpan':
-    'end': 51
-    'start': 47
-  'matchedContent': 'AMZN'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Futurama.S03E05.Amazon.Women.in.the.Mood.NF.WEB DL.DDP2.0.x264 CtrlSD.mkv'
-  'lastRun': '2024-12-06T01:59:08.829137'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Amazon.Women.on.the.Moon.1987.720p.BluRay.x264-HANDJOB.mkv'
-  'lastRun': '2024-12-06T01:59:08.829137'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'First.Contact.Lost.Tribe.of.the.Amazon.2016.1080p.AMZN.WEB-DL.DDP2.0.H.264-Q0SWeb.mkv'
-  'lastRun': '2024-12-06T01:59:08.829137'
-  'matchSpan':
-    'end': 54
-    'start': 50
-  'matchedContent': 'AMZN'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'First.Contact.Lost.Tribe.of.the.Amazon.2016.1080p.WEB-DL.DDP2.0.H.264-Q0SWeb.mkv'
-  'lastRun': '2024-12-06T01:59:08.829137'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Amazon Prime.yml b/regex_patterns/Amazon Prime.yml
index 6b40586..debaac1 100644
--- a/regex_patterns/Amazon Prime.yml	
+++ b/regex_patterns/Amazon Prime.yml	
@@ -6,7 +6,6 @@ description: Amazon Prime Video, or simply Prime Video, is an American subscript
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/AniVoid.yml b/regex_patterns/AniVoid.yml
deleted file mode 100644
index 8765540..0000000
--- a/regex_patterns/AniVoid.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AniVoid'
-pattern: \b(AniVoid)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Anime-Chap.yml b/regex_patterns/Anime-Chap.yml
deleted file mode 100644
index e90f619..0000000
--- a/regex_patterns/Anime-Chap.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Anime Chap'
-pattern: \b(Anime[ .-]?Chap)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Anime-Land.yml b/regex_patterns/Anime-Land.yml
deleted file mode 100644
index a525504..0000000
--- a/regex_patterns/Anime-Land.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Anime Land'
-pattern: \b(Anime[ .-]?Land)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Anime-Time.yml b/regex_patterns/Anime-Time.yml
deleted file mode 100644
index 29d0fba..0000000
--- a/regex_patterns/Anime-Time.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Anime Time'
-pattern: \b(Anime[ .-]?Time)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AnimeDynastyEN.yml b/regex_patterns/AnimeDynastyEN.yml
deleted file mode 100644
index dd37155..0000000
--- a/regex_patterns/AnimeDynastyEN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AnimeDynastyEN'
-pattern: \b(AnimeDynastyEN)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AnimeKuro.yml b/regex_patterns/AnimeKuro.yml
deleted file mode 100644
index c7eb746..0000000
--- a/regex_patterns/AnimeKuro.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AnimeKuro'
-pattern: \b(AnimeKuro)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AnimeRG.yml b/regex_patterns/AnimeRG.yml
deleted file mode 100644
index 8a02d09..0000000
--- a/regex_patterns/AnimeRG.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AnimeRG'
-pattern: \b(AnimeRG)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AnimeTR.yml b/regex_patterns/AnimeTR.yml
deleted file mode 100644
index 505d3de..0000000
--- a/regex_patterns/AnimeTR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AnimeTR'
-pattern: \b(AnimeTR)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Animesubs.yml b/regex_patterns/Animesubs.yml
deleted file mode 100644
index af8e04e..0000000
--- a/regex_patterns/Animesubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Animesubs'
-pattern: \b(Animesubs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Anitsu.yml b/regex_patterns/Anitsu.yml
deleted file mode 100644
index 798b9f3..0000000
--- a/regex_patterns/Anitsu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Anitsu'
-pattern: \b(Anitsu)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Apple TV+ (1).yml b/regex_patterns/Apple TV+ (1).yml
deleted file mode 100644
index 1a50a67..0000000
--- a/regex_patterns/Apple TV+ (1).yml	
+++ /dev/null
@@ -1,29 +0,0 @@
-'description': 'Apple TV+ is an American subscription OTT streaming service owned
-  and operated by Apple Inc. Launched on November 1, 2019, it offers a selection of
-  original production film and television series called Apple Originals.'
-'name': 'Apple TV+'
-'pattern': '\b(atvp|aptv|Apple TV\+)\s*\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Palmer.1080p.APTV.WEB-DL.DDP5.1.Atmos.H.264-EVO.mkv'
-  'lastRun': '2024-12-03T02:31:55.764873'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Fathom.1080p.APTV.WEB-DL.DDP5.1.Atmos.H.264-CMRG.mkv'
-  'lastRun': '2024-12-03T02:31:55.764873'
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'You.Are.the.Apple.of.My.Eye.2011.720p.BluRay.DD5.1.x264-EbP.mkv'
-  'lastRun': '2024-12-03T02:31:55.764873'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Men in Black 1997 2160p Apple TV+ WEB-DL DDP 5 1 Atmos DV H 265-CHDWEB'
-  'lastRun': '2024-12-03T02:31:55.764873'
-  'passes': true
diff --git a/regex_patterns/Apple TV+.yml b/regex_patterns/Apple TV+.yml
index 33db579..e1ed3c8 100644
--- a/regex_patterns/Apple TV+.yml	
+++ b/regex_patterns/Apple TV+.yml	
@@ -6,7 +6,6 @@ description: Apple TV+ is an American subscription OTT streaming service owned a
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/ArataEnc.yml b/regex_patterns/ArataEnc.yml
deleted file mode 100644
index 627bac6..0000000
--- a/regex_patterns/ArataEnc.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ArataEnc'
-pattern: \b(ArataEnc)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Arg0.yml b/regex_patterns/Arg0.yml
deleted file mode 100644
index 073a91f..0000000
--- a/regex_patterns/Arg0.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Arg0
-pattern: \b(Arg0)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Ari.yml b/regex_patterns/Ari.yml
deleted file mode 100644
index caf4165..0000000
--- a/regex_patterns/Ari.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Ari'
-pattern: \[Ari\]|-Ari\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Arid (1).yml b/regex_patterns/Arid (1).yml
deleted file mode 100644
index 67594c4..0000000
--- a/regex_patterns/Arid (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Arid'
-'pattern': '(?<=^|[\s.-])Arid\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Arid.yml b/regex_patterns/Arid.yml
index 80526be..9edffe9 100644
--- a/regex_patterns/Arid.yml
+++ b/regex_patterns/Arid.yml
@@ -1,6 +1,7 @@
 name: Arid
-pattern: \[Arid\]|-Arid\b
+pattern: (?<=^|[\s.-])Arid\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Asakura (1).yml b/regex_patterns/Asakura (1).yml
deleted file mode 100644
index 1d29ef6..0000000
--- a/regex_patterns/Asakura (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Asakura'
-'pattern': '(?<=^|[\s.-])Asakura\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Asakura.yml b/regex_patterns/Asakura.yml
index b7199fc..8116122 100644
--- a/regex_patterns/Asakura.yml
+++ b/regex_patterns/Asakura.yml
@@ -1,6 +1,7 @@
-name: 'Asakura'
-pattern: \[Asakura\]|-Asakura\b
+name: Asakura
+pattern: (?<=^|[\s.-])Asakura\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Asenshi.yml b/regex_patterns/Asenshi.yml
deleted file mode 100644
index fccdf6d..0000000
--- a/regex_patterns/Asenshi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Asenshi'
-pattern: \b(Asenshi)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/AssMix.yml b/regex_patterns/AssMix.yml
deleted file mode 100644
index c184940..0000000
--- a/regex_patterns/AssMix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'AssMix'
-pattern: \b(AssMix)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Atmos (1).yml b/regex_patterns/Atmos (1).yml
deleted file mode 100644
index 884624b..0000000
--- a/regex_patterns/Atmos (1).yml	
+++ /dev/null
@@ -1,45 +0,0 @@
-'description': ''
-'name': 'Atmos'
-'pattern': '\bATMOS(\b|\d)'
-'tags':
-- 'Audio'
-- 'Enhancement'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP'
-  'lastRun': '2025-01-06T15:07:07.378833'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR'
-  'lastRun': '2025-01-06T15:07:07.378833'
-  'matchSpan':
-    'end': 48
-    'start': 43
-  'matchedContent': 'Atmos'
-  'matchedGroups':
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX'
-  'lastRun': '2025-01-06T15:07:07.378833'
-  'matchSpan':
-    'end': 49
-    'start': 44
-  'matchedContent': 'Atmos'
-  'matchedGroups':
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX'
-  'lastRun': '2025-01-06T15:07:07.378833'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Ayashii.yml b/regex_patterns/Ayashii.yml
deleted file mode 100644
index c081cbf..0000000
--- a/regex_patterns/Ayashii.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Ayashii'
-pattern: \[Ayashii\]|-Ayashii\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/B&W (1).yml b/regex_patterns/B&W (1).yml
deleted file mode 100644
index 99d5891..0000000
--- a/regex_patterns/B&W (1).yml	
+++ /dev/null
@@ -1,97 +0,0 @@
-'description': 'Black and White colour grading. This regex matches a 4-digit number
-  (optionally surrounded by parentheses), followed by any amount of text, and then
-  detects references to "black and white" in various formats. It supports `blackwhite`
-  (no spaces), `black and white`, `black-white`, "`black & white`, `black/white`,
-  as well as shorthand `BW` and `B&W`, while excluding invalid variations like `b
-  w`, `b-w`, or `b/w`'
-'name': 'B&W'
-'pattern': '\d{4}.*?\bblack\b[\s.]*(?:and|\&|-|\/)?[\s.]*\bwhite\b|\bb\&?w\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Mist Black and White 2007 2160p USA UHD Blu-ray DV HDR HEVC TrueHD
-    7.1 Atmos-BeyondHD'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': false
-- 'expected': false
-  'id': 2
-  'input': 'Black and White 2002 1080p Blu-ray AVC DTS-HD MA 5.1-CultFilms'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Pokemon the Movie: Black and White-Victini and Reshiram Zekrom 2011 1080p
-    AUS BD50 DTS-HD MA 5.1 AVC-PHOENiX'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Madeo 2009 Black & White Version 1080p JPN Blu-ray AVC TrueHD 5.1-kyRLS'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan':
-    'end': 24
-    'start': 6
-  'matchedContent': '2009 Black & White'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'Psycho (1960) B&W'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan':
-    'end': 17
-    'start': 7
-  'matchedContent': '(1960) B&W'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': 'Citizen Kane (1941) Black.and.White'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan':
-    'end': 35
-    'start': 13
-  'matchedContent': '(1941) Black.and.White'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Dracula (1931) Black-White'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan':
-    'end': 26
-    'start': 8
-  'matchedContent': '(1931) Black-White'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 11
-  'input': 'Young Frankenstein (1974) BW DVDRip'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan':
-    'end': 28
-    'start': 19
-  'matchedContent': '(1974) BW'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 12
-  'input': 'Jack Black & Betty White in a Comedy Special'
-  'lastRun': '2025-02-14T14:41:22.957835'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/B&W.yml b/regex_patterns/B&W.yml
index 3229925..844421e 100644
--- a/regex_patterns/B&W.yml
+++ b/regex_patterns/B&W.yml
@@ -7,8 +7,8 @@ description: Black and White colour grading. This regex matches a 4-digit number
   `BW` and `B&W`, while excluding invalid variations like `b w`, `b-w`, or `b/w`
 tags:
 - Enhancement
-- Unwanted
 - Colour Grade
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/BARC0DE.yml b/regex_patterns/BARC0DE.yml
deleted file mode 100644
index 955b326..0000000
--- a/regex_patterns/BARC0DE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BARC0DE'
-pattern: '^(BARC0DE)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BAUCKLEY.yml b/regex_patterns/BAUCKLEY.yml
deleted file mode 100644
index 27a8f08..0000000
--- a/regex_patterns/BAUCKLEY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BAUCKLEY'
-pattern: '^(BAUCKLEY)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BBQ.yml b/regex_patterns/BBQ.yml
deleted file mode 100644
index 49ac487..0000000
--- a/regex_patterns/BBQ.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BBQ'
-pattern: '^(BBQ)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BD3D.yml b/regex_patterns/BD3D.yml
deleted file mode 100644
index 76a0b33..0000000
--- a/regex_patterns/BD3D.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BD3D'
-pattern: '\b(BD3D)\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BEN-THE-MEN.yml b/regex_patterns/BEN-THE-MEN.yml
deleted file mode 100644
index 152c59d..0000000
--- a/regex_patterns/BEN-THE-MEN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BEN THE MEN'
-pattern: '\\b(BEN[ ._-]THE[ ._-]MEN)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BHDStudio (1).yml b/regex_patterns/BHDStudio (1).yml
deleted file mode 100644
index 949efdd..0000000
--- a/regex_patterns/BHDStudio (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BHDStudio'
-'pattern': '(?<=^|[\s.-])BHDStudio\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BHDStudio.yml b/regex_patterns/BHDStudio.yml
index 02d237a..60cf453 100644
--- a/regex_patterns/BHDStudio.yml
+++ b/regex_patterns/BHDStudio.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BHDStudio\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/BJX.yml b/regex_patterns/BJX.yml
deleted file mode 100644
index 87e899c..0000000
--- a/regex_patterns/BJX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BJX'
-pattern: \b(BJX)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BKC.yml b/regex_patterns/BKC.yml
deleted file mode 100644
index f350924..0000000
--- a/regex_patterns/BKC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: BKC
-pattern: \b(BKC)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BLUEBIRD (1).yml b/regex_patterns/BLUEBIRD (1).yml
deleted file mode 100644
index 333d869..0000000
--- a/regex_patterns/BLUEBIRD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BLUEBIRD'
-'pattern': '(?<=^|[\s.-])BLUEBIRD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BLUEBIRD.yml b/regex_patterns/BLUEBIRD.yml
index 2b0eccc..7268a81 100644
--- a/regex_patterns/BLUEBIRD.yml
+++ b/regex_patterns/BLUEBIRD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BLUEBIRD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/BLURANiUM (1).yml b/regex_patterns/BLURANiUM (1).yml
deleted file mode 100644
index f91dc55..0000000
--- a/regex_patterns/BLURANiUM (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BLURANiUM'
-'pattern': '(?<=^|[\s.-])BLURANiUM\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/BLURANiUM.yml b/regex_patterns/BLURANiUM.yml
index 2ceb158..19998e9 100644
--- a/regex_patterns/BLURANiUM.yml
+++ b/regex_patterns/BLURANiUM.yml
@@ -1,6 +1,7 @@
 name: BLURANiUM
-pattern: ^(BLURANiUM)$
+pattern: (?<=^|[\s.-])BLURANiUM\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/BLUTONiUM (1).yml b/regex_patterns/BLUTONiUM (1).yml
deleted file mode 100644
index 84d9a49..0000000
--- a/regex_patterns/BLUTONiUM (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BLUTONiUM'
-'pattern': '(?<=^|[\s.-])BLUTONiUM\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/BLUTONiUM.yml b/regex_patterns/BLUTONiUM.yml
index c9e456d..9f0916f 100644
--- a/regex_patterns/BLUTONiUM.yml
+++ b/regex_patterns/BLUTONiUM.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BLUTONiUM\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/BMF (1).yml b/regex_patterns/BMF (1).yml
deleted file mode 100644
index 8ae3005..0000000
--- a/regex_patterns/BMF (1).yml	
+++ /dev/null
@@ -1,8 +0,0 @@
-'description': ''
-'name': 'BMF'
-'pattern': '(?<=^|[\s.-])BMF\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BMF.yml b/regex_patterns/BMF.yml
index 6884b73..2616248 100644
--- a/regex_patterns/BMF.yml
+++ b/regex_patterns/BMF.yml
@@ -3,4 +3,6 @@ pattern: (?<=^|[\s.-])BMF\b
 description: ''
 tags:
 - Release Group
+- Remux
+- Bluray
 tests: []
diff --git a/regex_patterns/BOLS.yml b/regex_patterns/BOLS.yml
index e7e5764..8431e49 100644
--- a/regex_patterns/BOLS.yml
+++ b/regex_patterns/BOLS.yml
@@ -1,7 +1,7 @@
-'description': 'Banned for Retagging'
-'name': 'BOLS'
-'pattern': '(?<=^|[\s.-])BOLS\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: BOLS
+pattern: (?<=^|[\s.-])BOLS\b
+description: Banned for Retagging
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/BOREDOR (1).yml b/regex_patterns/BOREDOR (1).yml
deleted file mode 100644
index 0cca181..0000000
--- a/regex_patterns/BOREDOR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BOREDOR'
-'pattern': '(?<=^|[\s.-])BOREDOR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BOREDOR.yml b/regex_patterns/BOREDOR.yml
index 4f06d0c..912a086 100644
--- a/regex_patterns/BOREDOR.yml
+++ b/regex_patterns/BOREDOR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BOREDOR\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/BR-DISK.yml b/regex_patterns/BR-DISK.yml
deleted file mode 100644
index 4ef5d71..0000000
--- a/regex_patterns/BR-DISK.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: BR-DISK
-pattern: '^(?!.*\b((?<!HD[._ -]|HD)DVD|BDRip|720p|MKV|XviD|WMV|d3g|(BD)?REMUX|^(?=.*1080p)(?=.*HEVC)|[xh][-_. ]?26[45]|German.*[DM]L|((?<=\d{4}).*German.*([DM]L)?)(?=.*\b(AVC|HEVC|VC[-_. ]?1|MVC|MPEG[-_. ]?2)\b))\b)(((?=.*\b(Blu[-_. ]?ray|BD|HD[-_. ]?DVD)\b)(?=.*\b(AVC|HEVC|VC[-_. ]?1|MVC|MPEG[-_. ]?2|BDMV|ISO)\b))|^((?=.*\b(((?=.*\b((.*_)?COMPLETE.*|Dis[ck])\b)(?=.*(Blu[-_. ]?ray|HD[-_. ]?DVD)))|3D[-_. ]?BD|BR[-_. ]?DISK|Full[-_. ]?Blu[-_. ]?ray|^((?=.*((BD|UHD)[-_. ]?(25|50|66|100|ISO)))))))).*'
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/BSTD (1).yml b/regex_patterns/BSTD (1).yml
deleted file mode 100644
index 968a774..0000000
--- a/regex_patterns/BSTD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BSTD'
-'pattern': '(?<=^|[\s.-])BSTD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BSTD.yml b/regex_patterns/BSTD.yml
index 684b25b..0a9a1a8 100644
--- a/regex_patterns/BSTD.yml
+++ b/regex_patterns/BSTD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BSTD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/BTN (1).yml b/regex_patterns/BTN (1).yml
deleted file mode 100644
index 55e9e95..0000000
--- a/regex_patterns/BTN (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BTN'
-'pattern': '(?<=^|[\s.-])BTN\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/BTN Atmos (1).yml b/regex_patterns/BTN Atmos (1).yml
deleted file mode 100644
index 02b262c..0000000
--- a/regex_patterns/BTN Atmos (1).yml	
+++ /dev/null
@@ -1,52 +0,0 @@
-'description': 'Matches BroadcastTheNet Atmos naming convention'
-'name': 'BTN Atmos'
-'pattern': '\bTrue[ .-]?HDA[ .-]?[57]\.1|DDPA[57]\.1\b'
-'tags':
-- 'Audio'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP'
-  'lastRun': '2025-01-11T23:15:36.540509'
-  'matchSpan':
-    'end': 52
-    'start': 42
-  'matchedContent': 'TrueHDA7.1'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR'
-  'lastRun': '2025-01-11T23:15:36.540509'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX'
-  'lastRun': '2025-01-11T23:15:36.540509'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX'
-  'lastRun': '2025-01-11T23:15:36.540509'
-  'matchSpan':
-    'end': 50
-    'start': 43
-  'matchedContent': 'DDPA5.1'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI'
-  'lastRun': '2025-01-11T23:15:36.540509'
-  'matchSpan':
-    'end': 43
-    'start': 32
-  'matchedContent': 'TrueHDA.7.1'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/BTN Atmos.yml b/regex_patterns/BTN Atmos.yml
index 3f89665..ee6283f 100644
--- a/regex_patterns/BTN Atmos.yml	
+++ b/regex_patterns/BTN Atmos.yml	
@@ -1,7 +1,8 @@
 name: BTN Atmos
 pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1|DDPA[57]\.1\b
 description: Matches BroadcastTheNet Atmos naming convention
-tags: []
+tags:
+- Audio
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/BTN.yml b/regex_patterns/BTN.yml
index 584c049..6f3cfa3 100644
--- a/regex_patterns/BTN.yml
+++ b/regex_patterns/BTN.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BTN\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/BTW.yml b/regex_patterns/BTW.yml
deleted file mode 100644
index fb18e6f..0000000
--- a/regex_patterns/BTW.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: BTW
-pattern: ^(BTW)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BV (1).yml b/regex_patterns/BV (1).yml
deleted file mode 100644
index 1bef4a0..0000000
--- a/regex_patterns/BV (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BV'
-'pattern': '(?<=^|[\s.-])BV\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BV.yml b/regex_patterns/BV.yml
index 933e64b..dff9b58 100644
--- a/regex_patterns/BV.yml
+++ b/regex_patterns/BV.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BV\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/BYNDR (1).yml b/regex_patterns/BYNDR (1).yml
deleted file mode 100644
index 6e1d050..0000000
--- a/regex_patterns/BYNDR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BYNDR'
-'pattern': '(?<=^|[\s.-])BYNDR\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/BYNDR.yml b/regex_patterns/BYNDR.yml
index 2703b2b..ede8b0d 100644
--- a/regex_patterns/BYNDR.yml
+++ b/regex_patterns/BYNDR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BYNDR\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/Basic HDR Formats (1).yml b/regex_patterns/Basic HDR Formats (1).yml
deleted file mode 100644
index f327cb0..0000000
--- a/regex_patterns/Basic HDR Formats (1).yml	
+++ /dev/null
@@ -1,110 +0,0 @@
-'description': 'Matches Dolby Vision OR HDR10. Needed to better match UHD Blurays'
-'name': 'Basic HDR Formats'
-'pattern': '(?:(?<=^(?!.*\b(HLG|PQ|SDR)(\b|\d)).*?)HDR)|\b(dv(?![ .](HLG|SDR))|dovi|dolby[
-  .]?vision)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': true
-  'id': 5
-  'input': 'MovieName.1080p.DV.mkv'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan':
-    'end': 18
-    'start': 16
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - null
-  - null
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'MovieName.4K.Dolby Vision.IMAX.mkv'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan':
-    'end': 25
-    'start': 13
-  'matchedContent': 'Dolby Vision'
-  'matchedGroups':
-  - null
-  - null
-  - 'Dolby Vision'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'MovieName.2023.4K.DV.HLG.mkv'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 8
-  'input': 'MovieName.2023.4K.DV.SDR.mkv'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'MovieName.4K.DV.SDR.Dovi.mkv'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan':
-    'end': 24
-    'start': 20
-  'matchedContent': 'Dovi'
-  'matchedGroups':
-  - null
-  - null
-  - 'Dovi'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan':
-    'end': 61
-    'start': 59
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - null
-  - null
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 11
-  'input': 'Avatar: The Way of Water 2022 1080p UHD BluRay DDP 7.1 HDR10 x265-GALAXY'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan':
-    'end': 58
-    'start': 55
-  'matchedContent': 'HDR'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 12
-  'input': 'Avatar: The Way of Water [2022] 2160p HEVC WEB-DL HDR10+ -CMRG'
-  'lastRun': '2025-01-13T08:51:12.077354'
-  'matchSpan':
-    'end': 53
-    'start': 50
-  'matchedContent': 'HDR'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  'passes': true
diff --git a/regex_patterns/Baws.yml b/regex_patterns/Baws.yml
deleted file mode 100644
index 7a7122f..0000000
--- a/regex_patterns/Baws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Baws
-pattern: \b(Baws)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BdC.yml b/regex_patterns/BdC.yml
deleted file mode 100644
index 233b5c9..0000000
--- a/regex_patterns/BdC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BdC'
-pattern: '^(BdC)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Beatrice-Raws.yml b/regex_patterns/Beatrice-Raws.yml
deleted file mode 100644
index 243a3cc..0000000
--- a/regex_patterns/Beatrice-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Beatrice-Raws'
-pattern: Beatrice[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BeiTa.yml b/regex_patterns/BeiTa.yml
deleted file mode 100644
index 3cef482..0000000
--- a/regex_patterns/BeiTa.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: BeiTa
-pattern: (?<=^|[\s.-])BeiTa\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/BeiTai (1).yml b/regex_patterns/BeiTai (1).yml
deleted file mode 100644
index 976859e..0000000
--- a/regex_patterns/BeiTai (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BeiTai'
-'pattern': '(?<=^|[\s.-])BeiTai\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BeiTai.yml b/regex_patterns/BeiTai.yml
index c358a0e..cb60240 100644
--- a/regex_patterns/BeiTai.yml
+++ b/regex_patterns/BeiTai.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BeiTai\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Better Theatricals (1).yml b/regex_patterns/Better Theatricals (1).yml
deleted file mode 100644
index ca52da2..0000000
--- a/regex_patterns/Better Theatricals (1).yml	
+++ /dev/null
@@ -1,330 +0,0 @@
-'description': 'Matches movies where the `Theatrical` cut is considered the better
-  version. Subjectively chosen, based on Dictionarry''s personal preferences and major
-  opinion. Needed to override the default special edition preference. Matches:
-
-  - Terminator 2: Judgement Day (1991)
-
-  - Alien (1979)
-
-  - Star Wars OT (1977-1983)
-
-  - Apocalypse Now (1979)
-
-  - The Exorcist (1973)
-
-  - Donnie Darko (2001)
-
-  - Amadeus (1984)
-
-  - Payback (1999)
-
-  - Almost Famous (2000)'
-'name': 'Better Theatricals'
-'pattern': '^\b(terminator.?2|alien[^s].*?1979|star.wars.*?(4k|19)(77)|.*?\bempire.strikes.back|.*?\breturn.of.the.jedi|apocalypse.now|the.exorcist.*?1973|donnie.darko|amadeus|payback.*?1999|payback.straight.up.*?2006|almost.famous)\b'
-'tags':
-- 'Edition'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Terminator.2.Judgment.Day.Theatrical.Cut.1991.1080p.BluRay.DTS.x264.D-Z0N3'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 12
-    'start': 0
-  'matchedContent': 'Terminator.2'
-  'matchedGroups':
-  - 'Terminator.2'
-  - null
-  - null
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': ' Aliens.1986.Special.Edition.1080p.BluRay.DTS.x264-Geek.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Alien.1979.Directors.Cut.2in1.BluRay.1080p.AVC.DTS-HD.MA5.1-CHDBits'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 10
-    'start': 0
-  'matchedContent': 'Alien.1979'
-  'matchedGroups':
-  - 'Alien.1979'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'star.wars.4K77.2160p.UHD.No-DNR.35mm.x265-v1.4.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 14
-    'start': 0
-  'matchedContent': 'star.wars.4K77'
-  'matchedGroups':
-  - 'star.wars.4K77'
-  - '4K'
-  - '77'
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Star.Wars.Episode.IV.A.New.Hope.1977.COMPLETE.UHD.BLURAY-DIZZKNEE'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 36
-    'start': 0
-  'matchedContent': 'Star.Wars.Episode.IV.A.New.Hope.1977'
-  'matchedGroups':
-  - 'Star.Wars.Episode.IV.A.New.Hope.1977'
-  - '19'
-  - '77'
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'Star.Wars.1977.Theatrical.Cut.DVDRip.AC3.x264.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 14
-    'start': 0
-  'matchedContent': 'Star.Wars.1977'
-  'matchedGroups':
-  - 'Star.Wars.1977'
-  - '19'
-  - '77'
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': '03 Empire.Strikes.Back.4K80.2160p.UHD.no-DNR.35mm.x265-v1.0.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 22
-    'start': 0
-  'matchedContent': '03 Empire.Strikes.Back'
-  'matchedGroups':
-  - '03 Empire.Strikes.Back'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Star.Wars.Episode.V.The.Empire.Strikes.Back.1980.2160p.UHD.BluRay.Remux.HDR.HEVC.Atmos-PmP.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 43
-    'start': 0
-  'matchedContent': 'Star.Wars.Episode.V.The.Empire.Strikes.Back'
-  'matchedGroups':
-  - 'Star.Wars.Episode.V.The.Empire.Strikes.Back'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'Empire.Strikes.Back.1980.35mm.Renegade.Grindhouse.Scan.480p.DD2.0.x264.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 19
-    'start': 0
-  'matchedContent': 'Empire.Strikes.Back'
-  'matchedGroups':
-  - 'Empire.Strikes.Back'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Return.of.the.Jedi.4K83.2160p.UHD.35mm.x265-v1.1.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 18
-    'start': 0
-  'matchedContent': 'Return.of.the.Jedi'
-  'matchedGroups':
-  - 'Return.of.the.Jedi'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 11
-  'input': 'Star Wars Episode VI - Return of the Jedi (1983) 2160p UHD BluRay TrueHD
-    7.1 HDR x265-Chotab.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 41
-    'start': 0
-  'matchedContent': 'Star Wars Episode VI - Return of the Jedi'
-  'matchedGroups':
-  - 'Star Wars Episode VI - Return of the Jedi'
-  - null
-  - null
-  'passes': true
-- 'expected': false
-  'id': 12
-  'input': 'Star.Wars.Episode.IX.The.Rise.of.Skywalker.2019.UHD.BluRay.2160p.TrueHD.Atmos.7.1.HEVC.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 13
-  'input': 'Apocalypse.Now.1979.Final.Cut.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.HYBRID.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 14
-    'start': 0
-  'matchedContent': 'Apocalypse.Now'
-  'matchedGroups':
-  - 'Apocalypse.Now'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 14
-  'input': 'The.Exorcist.1973.2160p.UHD.Blu-ray.Remux.HDR.HEVC.TrueHD.7.1.Atmos-CiNEPHiLES.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 17
-    'start': 0
-  'matchedContent': 'The.Exorcist.1973'
-  'matchedGroups':
-  - 'The.Exorcist.1973'
-  - null
-  - null
-  'passes': true
-- 'expected': false
-  'id': 15
-  'input': 'The Pope''s Exorcist 2023 1080p WEBRip DD+5.1 x264-HiDt.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 16
-  'input': 'The Exorcist III 1990 Theatrical 1080p BluRay DTS x264-VietHD.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 17
-  'input': 'Donnie.Darko.2001.2160p.UHD.Blu-ray.Remux.HEVC.HDR.DoVi.DTS-HD.MA.5.1-ARROW4KDV.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 12
-    'start': 0
-  'matchedContent': 'Donnie.Darko'
-  'matchedGroups':
-  - 'Donnie.Darko'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 18
-  'input': 'Amadeus.1984.Blu-Ray.1080p.DTSHD-MA.VC-1.Remux-HiFi.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 7
-    'start': 0
-  'matchedContent': 'Amadeus'
-  'matchedGroups':
-  - 'Amadeus'
-  - null
-  - null
-  'passes': true
-- 'expected': false
-  'id': 19
-  'input': 'National Theatre Live- Amadeus (2017).mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 20
-  'input': 'Payback.Straight.Up.Directors.Cut.1999.Bluray-PTP'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 38
-    'start': 0
-  'matchedContent': 'Payback.Straight.Up.Directors.Cut.1999'
-  'matchedGroups':
-  - 'Payback.Straight.Up.Directors.Cut.1999'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 21
-  'input': 'Payback.1999.Theatrical.Cut.BluRay.1080p.TrueHD.5.1.VC-1.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 12
-    'start': 0
-  'matchedContent': 'Payback.1999'
-  'matchedGroups':
-  - 'Payback.1999'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 22
-  'input': 'Payback Straight Up 2006 DC 1080p HDDVD DD5.1 x264-RightSiZE.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 24
-    'start': 0
-  'matchedContent': 'Payback Straight Up 2006'
-  'matchedGroups':
-  - 'Payback Straight Up 2006'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 23
-  'input': 'Payback.Theatrical.Cut.1999.1080p.BluRay.DD5.1.x264-REPTiLE.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 27
-    'start': 0
-  'matchedContent': 'Payback.Theatrical.Cut.1999'
-  'matchedGroups':
-  - 'Payback.Theatrical.Cut.1999'
-  - null
-  - null
-  'passes': true
-- 'expected': false
-  'id': 24
-  'input': ' Payback.2021.1080p.WEB.h264-RUMOUR.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 25
-  'input': 'Payback.DVDRip.AVC.AC3.(1995).mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 26
-  'input': 'Almost.Famous.2000.Bootleg.Cut.UHD.BluRay.2160p.DTS-HD.MA.5.1.DV.HEVC.HYBRID.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-24T21:16:01.912349'
-  'matchSpan':
-    'end': 13
-    'start': 0
-  'matchedContent': 'Almost.Famous'
-  'matchedGroups':
-  - 'Almost.Famous'
-  - null
-  - null
-  'passes': true
diff --git a/regex_patterns/BeyondHD (1).yml b/regex_patterns/BeyondHD (1).yml
deleted file mode 100644
index e677ef8..0000000
--- a/regex_patterns/BeyondHD (1).yml	
+++ /dev/null
@@ -1,18 +0,0 @@
-'description': 'Banned Due to only doing Full Discs'
-'name': 'BeyondHD'
-'pattern': '(?<=^|[\s.-])BeyondHD\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Game of Thrones (2012) S02 2160p UHD Blu-ray HEVC DV HDR TrueHD Atmos
-    7.1 English-BeyondHD'
-  'lastRun': '2024-12-13T17:46:48.251985'
-  'matchSpan':
-    'end': 90
-    'start': 82
-  'matchedContent': 'BeyondHD'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/BeyondHD.yml b/regex_patterns/BeyondHD.yml
index 18fad56..2ab87d4 100644
--- a/regex_patterns/BeyondHD.yml
+++ b/regex_patterns/BeyondHD.yml
@@ -1,8 +1,9 @@
 name: BeyondHD
 pattern: (?<=^|[\s.-])BeyondHD\b
-description: ''
+description: Banned Due to only doing Full Discs
 tags:
 - Release Group
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/BiTOR (1).yml b/regex_patterns/BiTOR (1).yml
deleted file mode 100644
index c24632f..0000000
--- a/regex_patterns/BiTOR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'BiTOR'
-'pattern': '(?<=^|[\s.-])BiTOR\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/BiTOR.yml b/regex_patterns/BiTOR.yml
index 8c89bab..621dea7 100644
--- a/regex_patterns/BiTOR.yml
+++ b/regex_patterns/BiTOR.yml
@@ -1,6 +1,7 @@
 name: BiTOR
 pattern: (?<=^|[\s.-])BiTOR\b
-description: ''
+description: Banned for Fake DV/HDR Layer
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/BiZKiT.yml b/regex_patterns/BiZKiT.yml
index 9a4dd3f..3864a04 100644
--- a/regex_patterns/BiZKiT.yml
+++ b/regex_patterns/BiZKiT.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'BiZKiT'
-'pattern': '(?<=^|[\s.-])BiZKiT\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: BiZKiT
+pattern: (?<=^|[\s.-])BiZKiT\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/BlackLuster.yml b/regex_patterns/BlackLuster.yml
deleted file mode 100644
index 58ab8bc..0000000
--- a/regex_patterns/BlackLuster.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BlackLuster'
-pattern: \b(BlackLuster)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Bloated Remux Groups.yml b/regex_patterns/Bloated Remux Groups.yml
deleted file mode 100644
index 1cfb9f0..0000000
--- a/regex_patterns/Bloated Remux Groups.yml	
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Bloated Remux Groups
-pattern: \b(LEGi0N|FGT|RARBG)\b
-description: Matches groups that add multiple audio tracks to remuxes
-tags:
-- Release Group
-tests:
-- expected: true
-  id: 3
-  input: Blade Runner 2049 2017 1080p BluRay REMUX AVC DTS-HD MA TrueHD 7 1 Atmos-FGT
-  lastRun: '2025-01-19T17:27:12.895135'
-  matchSpan:
-    end: 76
-    start: 73
-  matchedContent: FGT
-  matchedGroups:
-  - FGT
-  passes: true
-- expected: true
-  id: 4
-  input: Blade Runner 2049 2017 REMUX 1080p Blu-ray AVC DTS-HD MA 7 1-LEGi0N
-  lastRun: '2025-01-19T17:27:12.895135'
-  matchSpan:
-    end: 67
-    start: 61
-  matchedContent: LEGi0N
-  matchedGroups:
-  - LEGi0N
-  passes: true
diff --git a/regex_patterns/BluDragon.yml b/regex_patterns/BluDragon.yml
deleted file mode 100644
index ce62c8d..0000000
--- a/regex_patterns/BluDragon.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BluDragon'
-pattern: \b(BluDragon)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/BluRay3D.yml b/regex_patterns/BluRay3D.yml
deleted file mode 100644
index 04a5022..0000000
--- a/regex_patterns/BluRay3D.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BluRay3D'
-pattern: '\b(BluRay3D)\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BlueLobster.yml b/regex_patterns/BlueLobster.yml
deleted file mode 100644
index 8ca70d0..0000000
--- a/regex_patterns/BlueLobster.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'BlueLobster'
-pattern: \b(BlueLobster)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/BlurayDesuYo (1).yml b/regex_patterns/BlurayDesuYo (1).yml
deleted file mode 100644
index 679092a..0000000
--- a/regex_patterns/BlurayDesuYo (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BlurayDesuYo'
-'pattern': '(?<=^|[\s.-])BlurayDesuYo\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/BlurayDesuYo.yml b/regex_patterns/BlurayDesuYo.yml
index 285e93c..74c63ac 100644
--- a/regex_patterns/BlurayDesuYo.yml
+++ b/regex_patterns/BlurayDesuYo.yml
@@ -1,6 +1,7 @@
-name: 'BlurayDesuYo'
-pattern: \b(BlurayDesuYo)\b
+name: BlurayDesuYo
+pattern: (?<=^|[\s.-])BlurayDesuYo\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/BlzT (1).yml b/regex_patterns/BlzT (1).yml
deleted file mode 100644
index e6428a2..0000000
--- a/regex_patterns/BlzT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'BlzT'
-'pattern': '(?<=^|[\s.-])BlzT\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/BlzT.yml b/regex_patterns/BlzT.yml
index 9636482..213c283 100644
--- a/regex_patterns/BlzT.yml
+++ b/regex_patterns/BlzT.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])BlzT\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Bolshevik.yml b/regex_patterns/Bolshevik.yml
deleted file mode 100644
index 40c2841..0000000
--- a/regex_patterns/Bolshevik.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Bolshevik'
-pattern: \[Bolshevik\]|-Bolshevik\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Bracketed Year (1).yml b/regex_patterns/Bracketed Year (1).yml
deleted file mode 100644
index 482dda9..0000000
--- a/regex_patterns/Bracketed Year (1).yml	
+++ /dev/null
@@ -1,15 +0,0 @@
-'description': 'Match a year moniker inside square brackets'
-'name': 'Bracketed Year'
-'pattern': '\[\d{4}\]'
-'tags': []
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Loki S01 [2021] 2160p HEVC Blu-Ray Remux HDR10 -SiCFoI'
-  'lastRun': '2025-01-12T00:57:33.563808'
-  'matchSpan':
-    'end': 15
-    'start': 9
-  'matchedContent': '[2021]'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Bravia Core.yml b/regex_patterns/Bravia Core.yml
index 9e63381..794c36f 100644
--- a/regex_patterns/Bravia Core.yml	
+++ b/regex_patterns/Bravia Core.yml	
@@ -1,10 +1,10 @@
-'description': 'Sony Pictures Core (formerly known as Bravia Core) is a video on demand
+name: Bravia Core
+pattern: \b(BCORE)\b
+description: Sony Pictures Core (formerly known as Bravia Core) is a video on demand
   service from Sony for its televisions and smartphones, launched in April 2021. The
   service offers the streaming of movies at up to 4K resolution provided by Sony Pictures
-  Entertainment. CORE stands for Centre of Real Entertainment.'
-'name': 'Bravia Core'
-'pattern': '\b(BCORE)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+  Entertainment. CORE stands for Centre of Real Entertainment.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Bravia_Core.yml b/regex_patterns/Bravia_Core.yml
deleted file mode 100644
index f931b46..0000000
--- a/regex_patterns/Bravia_Core.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Bravia Core'
-pattern: '\\b(BCORE)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Brrrrrrr.yml b/regex_patterns/Brrrrrrr.yml
deleted file mode 100644
index 4b75efe..0000000
--- a/regex_patterns/Brrrrrrr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Brrrrrrr
-pattern: \b(Brrrrrrr)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Bulldog.yml b/regex_patterns/Bulldog.yml
deleted file mode 100644
index 52fbe6d..0000000
--- a/regex_patterns/Bulldog.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Bulldog'
-pattern: \[Bulldog\]|-Bulldog\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Bunny-Apocalypse (1).yml b/regex_patterns/Bunny-Apocalypse (1).yml
deleted file mode 100644
index 1a2711a..0000000
--- a/regex_patterns/Bunny-Apocalypse (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Bunny-Apocalypse'
-'pattern': '(?<=^|[\s.-])Bunny-Apocalypse\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Bunny-Apocalypse.yml b/regex_patterns/Bunny-Apocalypse.yml
index 713706c..9bc571d 100644
--- a/regex_patterns/Bunny-Apocalypse.yml
+++ b/regex_patterns/Bunny-Apocalypse.yml
@@ -1,6 +1,7 @@
-name: 'Bunny-Apocalypse'
-pattern: \b(Bunny-Apocalypse)\b
+name: Bunny-Apocalypse
+pattern: (?<=^|[\s.-])Bunny-Apocalypse\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/C1NEM4.yml b/regex_patterns/C1NEM4.yml
deleted file mode 100644
index de1ee03..0000000
--- a/regex_patterns/C1NEM4.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: C1NEM4
-pattern: ^(C1NEM4)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/C4K.yml b/regex_patterns/C4K.yml
deleted file mode 100644
index 8529d00..0000000
--- a/regex_patterns/C4K.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: C4K
-pattern: ^(C4K)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/CBB.yml b/regex_patterns/CBB.yml
deleted file mode 100644
index 3326c5a..0000000
--- a/regex_patterns/CBB.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CBB'
-pattern: \b(CBB)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CBM.yml b/regex_patterns/CBM.yml
deleted file mode 100644
index f89b6e2..0000000
--- a/regex_patterns/CBM.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CBM'
-pattern: \b(CBM)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CBT (1).yml b/regex_patterns/CBT (1).yml
deleted file mode 100644
index 7d82606..0000000
--- a/regex_patterns/CBT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CBT'
-'pattern': '(?<=^|[\s.-])CBT\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/CBT.yml b/regex_patterns/CBT.yml
index e839dd9..1b4139c 100644
--- a/regex_patterns/CBT.yml
+++ b/regex_patterns/CBT.yml
@@ -1,6 +1,7 @@
-name: 'CBT'
-pattern: \b(CBT)\b
+name: CBT
+pattern: (?<=^|[\s.-])CBT\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/CDDHD.yml b/regex_patterns/CDDHD.yml
deleted file mode 100644
index f21d52f..0000000
--- a/regex_patterns/CDDHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CDDHD
-pattern: ^(CDDHD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/CH.yml b/regex_patterns/CH.yml
deleted file mode 100644
index fe88fc2..0000000
--- a/regex_patterns/CH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CH'
-pattern: \[CH\]|-CH\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CHAOS (1).yml b/regex_patterns/CHAOS (1).yml
deleted file mode 100644
index 9053901..0000000
--- a/regex_patterns/CHAOS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CHAOS'
-'pattern': '(?<=^|[\s.-])CHAOS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CHAOS.yml b/regex_patterns/CHAOS.yml
index c730afe..0b50dc9 100644
--- a/regex_patterns/CHAOS.yml
+++ b/regex_patterns/CHAOS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CHAOS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/CHD (1).yml b/regex_patterns/CHD (1).yml
deleted file mode 100644
index a6f7a89..0000000
--- a/regex_patterns/CHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CHD'
-'pattern': '(?<=^|[\s.-])CHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CHD.yml b/regex_patterns/CHD.yml
index ba5747f..ae2e9fe 100644
--- a/regex_patterns/CHD.yml
+++ b/regex_patterns/CHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CHD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/CJ (1).yml b/regex_patterns/CJ (1).yml
deleted file mode 100644
index b312a7d..0000000
--- a/regex_patterns/CJ (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CJ'
-'pattern': '(?<=^|[\s.-])CJ\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CJ.yml b/regex_patterns/CJ.yml
index 0660ef8..48a63a0 100644
--- a/regex_patterns/CJ.yml
+++ b/regex_patterns/CJ.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CJ\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/CMCT (1).yml b/regex_patterns/CMCT (1).yml
deleted file mode 100644
index 92c3250..0000000
--- a/regex_patterns/CMCT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CMCT'
-'pattern': '(?<=^|[\s.-])CMCT\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/CMCT.yml b/regex_patterns/CMCT.yml
index a7cfd5c..584d3f8 100644
--- a/regex_patterns/CMCT.yml
+++ b/regex_patterns/CMCT.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CMCT\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Anime
+tests: []
diff --git a/regex_patterns/CMRG (1).yml b/regex_patterns/CMRG (1).yml
deleted file mode 100644
index b83152c..0000000
--- a/regex_patterns/CMRG (1).yml	
+++ /dev/null
@@ -1,31 +0,0 @@
-'description': 'Prolific WEB-DL group. '
-'name': 'CMRG'
-'pattern': '(?<=^|[\s.-])CM(a)?R(io)?G\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': '12 Dares of Christmas 2023 1080p AMZN WEB-DL DDP 2.0 H.264-CMRG'
-  'lastRun': '2024-12-06T05:58:57.443985'
-  'matchSpan':
-    'end': 63
-    'start': 59
-  'matchedContent': 'CMRG'
-  'matchedGroups':
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'The.Super.Mario.Bros.Movie.2023.1080p.MA.WEB-DL.DDP5.1.Atmos.H.264-CMaRioG.mkv'
-  'lastRun': '2024-12-06T05:58:57.443985'
-  'matchSpan':
-    'end': 74
-    'start': 67
-  'matchedContent': 'CMaRioG'
-  'matchedGroups':
-  - 'a'
-  - 'io'
-  'passes': true
diff --git a/regex_patterns/CMRG.yml b/regex_patterns/CMRG.yml
index 8d760d8..c9b11e0 100644
--- a/regex_patterns/CMRG.yml
+++ b/regex_patterns/CMRG.yml
@@ -3,7 +3,7 @@ pattern: (?<=^|[\s.-])CM(a)?R(io)?G\b
 description: 'Prolific WEB-DL group. '
 tags:
 - Release Group
-- iPT
+- WEB-DL
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/COLLECTiVE.yml b/regex_patterns/COLLECTiVE.yml
deleted file mode 100644
index d1eca46..0000000
--- a/regex_patterns/COLLECTiVE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: COLLECTiVE
-pattern: ^(COLLECTiVE)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/CREATiVE24 (1).yml b/regex_patterns/CREATiVE24 (1).yml
deleted file mode 100644
index 429da88..0000000
--- a/regex_patterns/CREATiVE24 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Bloated Garbage'
-'name': 'CREATiVE24'
-'pattern': '(?<=^|[\s.-])CREATiVE24\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CREATiVE24.yml b/regex_patterns/CREATiVE24.yml
index 0e798e2..af6f62e 100644
--- a/regex_patterns/CREATiVE24.yml
+++ b/regex_patterns/CREATiVE24.yml
@@ -1,6 +1,7 @@
 name: CREATiVE24
-pattern: ^(CREATiVE24)$
-description: ''
+pattern: (?<=^|[\s.-])CREATiVE24\b
+description: Banned for Bloated Garbage
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/CRFW (1).yml b/regex_patterns/CRFW (1).yml
deleted file mode 100644
index 9cae8df..0000000
--- a/regex_patterns/CRFW (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CRFW'
-'pattern': '(?<=^|[\s.-])CRFW\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/CRFW.yml b/regex_patterns/CRFW.yml
index 6363f36..68b68e3 100644
--- a/regex_patterns/CRFW.yml
+++ b/regex_patterns/CRFW.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CRFW\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/CRUD.yml b/regex_patterns/CRUD.yml
deleted file mode 100644
index 7843195..0000000
--- a/regex_patterns/CRUD.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "CRUD"
-pattern: "^(CRUD)$"
-description: ''
-tags:
-- Release Group
-- TRaSH
-tests: []
diff --git a/regex_patterns/CRX (1).yml b/regex_patterns/CRX (1).yml
deleted file mode 100644
index d58d763..0000000
--- a/regex_patterns/CRX (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CRX'
-'pattern': '(?<=^|[\s.-])CRX\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CRX.yml b/regex_patterns/CRX.yml
index dd133da..f5342cf 100644
--- a/regex_patterns/CRX.yml
+++ b/regex_patterns/CRX.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CRX\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/CRiSC (1).yml b/regex_patterns/CRiSC (1).yml
deleted file mode 100644
index a45a146..0000000
--- a/regex_patterns/CRiSC (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CRiSC'
-'pattern': '(?<=^|[\s.-])CRiSC\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CRiSC.yml b/regex_patterns/CRiSC.yml
index e6acb51..191cc34 100644
--- a/regex_patterns/CRiSC.yml
+++ b/regex_patterns/CRiSC.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CRiSC\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/CTFOH.yml b/regex_patterns/CTFOH.yml
deleted file mode 100644
index 86ea360..0000000
--- a/regex_patterns/CTFOH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CTFOH
-pattern: ^(CTFOH)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/CTR (1).yml b/regex_patterns/CTR (1).yml
deleted file mode 100644
index aa34754..0000000
--- a/regex_patterns/CTR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CTR'
-'pattern': '(?<=^|[\s.-])CTR\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/CTR.yml b/regex_patterns/CTR.yml
index bdc3225..91bbf91 100644
--- a/regex_patterns/CTR.yml
+++ b/regex_patterns/CTR.yml
@@ -1,6 +1,7 @@
-name: 'CTR'
-pattern: \b(CTR)\b
+name: CTR
+pattern: (?<=^|[\s.-])CTR\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/CUNNY.yml b/regex_patterns/CUNNY.yml
deleted file mode 100644
index 7a5208c..0000000
--- a/regex_patterns/CUNNY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CUNNY
-pattern: \b(CUNNY)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Cait-Sidhe (1).yml b/regex_patterns/Cait-Sidhe (1).yml
deleted file mode 100644
index 5156887..0000000
--- a/regex_patterns/Cait-Sidhe (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Cait-Sidhe'
-'pattern': '(?<=^|[\s.-])Cait-Sidhe\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Cait-Sidhe.yml b/regex_patterns/Cait-Sidhe.yml
index 61e8951..b55876a 100644
--- a/regex_patterns/Cait-Sidhe.yml
+++ b/regex_patterns/Cait-Sidhe.yml
@@ -1,6 +1,7 @@
-name: 'Cait-Sidhe'
-pattern: \b(Cait-Sidhe)\b
+name: Cait-Sidhe
+pattern: (?<=^|[\s.-])Cait-Sidhe\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/CameEsp.yml b/regex_patterns/CameEsp.yml
deleted file mode 100644
index 8de774b..0000000
--- a/regex_patterns/CameEsp.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CameEsp'
-pattern: \b(CameEsp)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CasStudio.yml b/regex_patterns/CasStudio.yml
deleted file mode 100644
index 5eb9590..0000000
--- a/regex_patterns/CasStudio.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CasStudio'
-pattern: ^(CasStudio)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Cat66.yml b/regex_patterns/Cat66.yml
deleted file mode 100644
index 57a25d0..0000000
--- a/regex_patterns/Cat66.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Cat66'
-pattern: \b(Cat66)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Cerberus.yml b/regex_patterns/Cerberus.yml
deleted file mode 100644
index 8ea399e..0000000
--- a/regex_patterns/Cerberus.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Cerberus'
-pattern: \[Cerberus\]|-Cerberus\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Chihiro (1).yml b/regex_patterns/Chihiro (1).yml
deleted file mode 100644
index 3d5bf93..0000000
--- a/regex_patterns/Chihiro (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Chihiro'
-'pattern': '(?<=^|[\s.-])Chihiro\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Chihiro.yml b/regex_patterns/Chihiro.yml
index 0f3c568..6d80eb2 100644
--- a/regex_patterns/Chihiro.yml
+++ b/regex_patterns/Chihiro.yml
@@ -1,6 +1,7 @@
-name: 'Chihiro'
-pattern: \[Chihiro\]|-Chihiro\b
+name: Chihiro
+pattern: (?<=^|[\s.-])Chihiro\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Chimera.yml b/regex_patterns/Chimera.yml
deleted file mode 100644
index 26ec04c..0000000
--- a/regex_patterns/Chimera.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Chimera'
-pattern: \[Chimera\]|-Chimera\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ChopperHitler.yml b/regex_patterns/ChopperHitler.yml
deleted file mode 100644
index e7a40f3..0000000
--- a/regex_patterns/ChopperHitler.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ChopperHitler
-pattern: (?<=^|[\s.-])ChopperHitler\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Chotab (1).yml b/regex_patterns/Chotab (1).yml
deleted file mode 100644
index a4db6f6..0000000
--- a/regex_patterns/Chotab (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Chotab'
-'pattern': '(?<=^|[\s.-])Chotab\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Chotab.yml b/regex_patterns/Chotab.yml
index dff0486..99a3eb8 100644
--- a/regex_patterns/Chotab.yml
+++ b/regex_patterns/Chotab.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Chotab\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/CiNE.yml b/regex_patterns/CiNE.yml
deleted file mode 100644
index 1dca9c5..0000000
--- a/regex_patterns/CiNE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CiNE
-pattern: ^(CiNE)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/CiNEPHiLES.yml b/regex_patterns/CiNEPHiLES.yml
index 6ef2ceb..a9416bb 100644
--- a/regex_patterns/CiNEPHiLES.yml
+++ b/regex_patterns/CiNEPHiLES.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'CiNEPHiLES'
-'pattern': '(?<=^|[\s.-])CiNEPHiLES\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: CiNEPHiLES
+pattern: (?<=^|[\s.-])CiNEPHiLES\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/CiT.yml b/regex_patterns/CiT.yml
deleted file mode 100644
index 31ff80a..0000000
--- a/regex_patterns/CiT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CiT
-pattern: ^(CiT)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Cinefeel (1).yml b/regex_patterns/Cinefeel (1).yml
deleted file mode 100644
index e02dbad..0000000
--- a/regex_patterns/Cinefeel (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "Cinefeel" when preceded by whitespace, a hyphen or dot'
-'name': 'Cinefeel'
-'pattern': '(?<=^|[\s.-])Cinefeel\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/Cinefeel.yml b/regex_patterns/Cinefeel.yml
index 6a690fd..759b4fc 100644
--- a/regex_patterns/Cinefeel.yml
+++ b/regex_patterns/Cinefeel.yml
@@ -1,6 +1,7 @@
 name: Cinefeel
-pattern: ^(Cinefeel)$
-description: ''
+pattern: (?<=^|[\s.-])Cinefeel\b
+description: Matches "Cinefeel" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/Cleo.yml b/regex_patterns/Cleo.yml
deleted file mode 100644
index a4cc985..0000000
--- a/regex_patterns/Cleo.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Cleo'
-pattern: \[Cleo\]|-Cleo
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CoalGirls (1).yml b/regex_patterns/CoalGirls (1).yml
deleted file mode 100644
index 05c8316..0000000
--- a/regex_patterns/CoalGirls (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CoalGirls'
-'pattern': '(?<=^|[\s.-])CoalGirls\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/CoalGirls.yml b/regex_patterns/CoalGirls.yml
index 18184d7..962dc79 100644
--- a/regex_patterns/CoalGirls.yml
+++ b/regex_patterns/CoalGirls.yml
@@ -1,6 +1,7 @@
-name: 'CoalGirls'
-pattern: \b(CoalGirls)\b
+name: CoalGirls
+pattern: (?<=^|[\s.-])CoalGirls\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Colourisation (1).yml b/regex_patterns/Colourisation (1).yml
deleted file mode 100644
index 779e41c..0000000
--- a/regex_patterns/Colourisation (1).yml	
+++ /dev/null
@@ -1,81 +0,0 @@
-'description': 'Colourisation (or colorization in American English) is the process
-  of adding colour to black-and-white, sepia, or other monochrome images. Matches
-  variations of `color` in both American and British spellings, including:
-
-
-  - **Base forms:** `color`, `colour`
-
-  - **Past tense/adjective forms:** `colored`, `coloured`
-
-  - **Verb forms:** `colorize`, `colourize`, `colorise`, `colourise`
-
-  - **Past participles:** `colorized`, `coloured`, `colourized`, `colourised`'
-'name': 'Colourisation'
-'pattern': '\bcolou?r(i[sz]ed?|ed)?\b'
-'tags':
-- 'Colour Grade'
-- 'Enhancement'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'colour'
-  'lastRun': '2025-02-22T19:10:06.067266'
-  'matchSpan':
-    'end': 6
-    'start': 0
-  'matchedContent': 'colour'
-  'matchedGroups':
-  - null
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'coloured'
-  'lastRun': '2025-02-22T19:10:06.067266'
-  'matchSpan':
-    'end': 8
-    'start': 0
-  'matchedContent': 'coloured'
-  'matchedGroups':
-  - 'ed'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'colourise'
-  'lastRun': '2025-02-22T19:10:06.067266'
-  'matchSpan':
-    'end': 9
-    'start': 0
-  'matchedContent': 'colourise'
-  'matchedGroups':
-  - 'ise'
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': 'colourised'
-  'lastRun': '2025-02-22T19:10:06.067266'
-  'matchSpan':
-    'end': 10
-    'start': 0
-  'matchedContent': 'colourised'
-  'matchedGroups':
-  - 'ised'
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'colored'
-  'lastRun': '2025-02-22T19:10:06.067266'
-  'matchSpan':
-    'end': 7
-    'start': 0
-  'matchedContent': 'colored'
-  'matchedGroups':
-  - 'ed'
-  'passes': true
-- 'expected': false
-  'id': 9
-  'input': 'discolor'
-  'lastRun': '2025-02-22T19:10:06.067266'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Commie (1).yml b/regex_patterns/Commie (1).yml
deleted file mode 100644
index ebe6ac3..0000000
--- a/regex_patterns/Commie (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Commie'
-'pattern': '(?<=^|[\s.-])Commie\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Commie.yml b/regex_patterns/Commie.yml
index 5b18248..c265ed5 100644
--- a/regex_patterns/Commie.yml
+++ b/regex_patterns/Commie.yml
@@ -1,6 +1,7 @@
-name: 'Commie'
-pattern: \b(Commie)\b
+name: Commie
+pattern: (?<=^|[\s.-])Commie\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Coo7.yml b/regex_patterns/Coo7.yml
deleted file mode 100644
index e40b7b6..0000000
--- a/regex_patterns/Coo7.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Coo7
-pattern: ^(Coo7)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CrEwSaDe.yml b/regex_patterns/CrEwSaDe.yml
deleted file mode 100644
index 53a4c5e..0000000
--- a/regex_patterns/CrEwSaDe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CrEwSaDe
-pattern: ^(CrEwSaDe)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Criterion Channel (1).yml b/regex_patterns/Criterion Channel (1).yml
deleted file mode 100644
index 2d5746a..0000000
--- a/regex_patterns/Criterion Channel (1).yml	
+++ /dev/null
@@ -1,53 +0,0 @@
-'description': 'The Criterion Channel is a subscription-based streaming service launched
-  on April 8, 2019, by The Criterion Collection. Available in the United States and
-  Canada, it features a rich library of films, including Criterion Collection releases
-  with special features, curated playlists, temporarily licensed titles, and original
-  content such as academic overviews and introductions. The Channel also showcases
-  Janus-owned titles not yet available on physical media and maintains a collaborative
-  relationship with Warner Bros. Discovery''s Max platform. Perfect for cinephiles,
-  the service brings a curated cinematic experience to the digital space.'
-'name': 'Criterion Channel'
-'pattern': '\b(CRiT)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Wild 90 1968 480p CRiT WEB-DL AAC2 0 x264-AT3N'
-  'lastRun': '2025-03-29T13:35:14.519621'
-  'matchSpan':
-    'end': 22
-    'start': 18
-  'matchedContent': 'CRiT'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Night Mother 1986 1080p CRiT WEB-DL AAC2 0 x264-AT3N'
-  'lastRun': '2025-03-29T13:35:14.519621'
-  'matchSpan':
-    'end': 28
-    'start': 24
-  'matchedContent': 'CRiT'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Please Speak Continuously and Describe Your Experiences as They Come to
-    You 2019 1080p CRIT WEB-DL AAC2 0 x264-SiGLA'
-  'lastRun': '2025-03-29T13:35:14.519621'
-  'matchSpan':
-    'end': 91
-    'start': 87
-  'matchedContent': 'CRIT'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'John Malkovich in The Music Critic 2021 720p WEB H264-LiQUiD'
-  'lastRun': '2025-03-29T13:35:14.519621'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Criterion Channel.yml b/regex_patterns/Criterion Channel.yml
index 2a788e5..5bbb5d2 100644
--- a/regex_patterns/Criterion Channel.yml	
+++ b/regex_patterns/Criterion Channel.yml	
@@ -1,5 +1,5 @@
 name: Criterion Channel
-pattern: \bCRiT\b
+pattern: \b(CRiT)\b
 description: The Criterion Channel is a subscription-based streaming service launched
   on April 8, 2019, by The Criterion Collection. Available in the United States and
   Canada, it features a rich library of films, including Criterion Collection releases
@@ -11,12 +11,11 @@ description: The Criterion Channel is a subscription-based streaming service lau
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
   input: Wild 90 1968 480p CRiT WEB-DL AAC2 0 x264-AT3N
-  lastRun: '2024-12-06T05:17:39.382994'
+  lastRun: '2025-03-29T13:35:14.519621'
   matchSpan:
     end: 22
     start: 18
@@ -26,7 +25,7 @@ tests:
 - expected: true
   id: 2
   input: Night Mother 1986 1080p CRiT WEB-DL AAC2 0 x264-AT3N
-  lastRun: '2024-12-06T05:17:39.382994'
+  lastRun: '2025-03-29T13:35:14.519621'
   matchSpan:
     end: 28
     start: 24
@@ -37,7 +36,7 @@ tests:
   id: 3
   input: Please Speak Continuously and Describe Your Experiences as They Come to You
     2019 1080p CRIT WEB-DL AAC2 0 x264-SiGLA
-  lastRun: '2024-12-06T05:17:39.382994'
+  lastRun: '2025-03-29T13:35:14.519621'
   matchSpan:
     end: 91
     start: 87
@@ -47,7 +46,7 @@ tests:
 - expected: false
   id: 4
   input: John Malkovich in The Music Critic 2021 720p WEB H264-LiQUiD
-  lastRun: '2024-12-06T05:17:39.382994'
+  lastRun: '2025-03-29T13:35:14.519621'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
diff --git a/regex_patterns/Crow.yml b/regex_patterns/Crow.yml
deleted file mode 100644
index 6c50f88..0000000
--- a/regex_patterns/Crow.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Crow
-pattern: \[Crow\]|-Crow\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Crunchyroll.yml b/regex_patterns/Crunchyroll.yml
deleted file mode 100644
index dcdaf84..0000000
--- a/regex_patterns/Crunchyroll.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Crunchyroll'
-pattern: '\\b(C(runchy)?[ .-]?R(oll)?)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CsS.yml b/regex_patterns/CsS.yml
deleted file mode 100644
index b0ca253..0000000
--- a/regex_patterns/CsS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: CsS
-pattern: \b(CsS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CtrlHD (1).yml b/regex_patterns/CtrlHD (1).yml
deleted file mode 100644
index cb0bc6b..0000000
--- a/regex_patterns/CtrlHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'CtrlHD'
-'pattern': '(?<=^|[\s.-])CtrlHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/CtrlHD.yml b/regex_patterns/CtrlHD.yml
index 98a5500..0def90c 100644
--- a/regex_patterns/CtrlHD.yml
+++ b/regex_patterns/CtrlHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])CtrlHD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/CuaP.yml b/regex_patterns/CuaP.yml
deleted file mode 100644
index 60227e1..0000000
--- a/regex_patterns/CuaP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CuaP'
-pattern: \b(CuaP)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/CyC.yml b/regex_patterns/CyC.yml
deleted file mode 100644
index d37c821..0000000
--- a/regex_patterns/CyC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'CyC'
-pattern: \b(CyC)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Cyan.yml b/regex_patterns/Cyan.yml
deleted file mode 100644
index 077ca94..0000000
--- a/regex_patterns/Cyan.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Cyan'
-pattern: \[Cyan\]|-Cyan\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/D-Z0N3 (1).yml b/regex_patterns/D-Z0N3 (1).yml
deleted file mode 100644
index a9982f2..0000000
--- a/regex_patterns/D-Z0N3 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'D-Z0N3'
-'pattern': '(?<=^|[\s.-])D-Z0N3\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/D-Z0N3.yml b/regex_patterns/D-Z0N3.yml
index 159ffa2..bf69101 100644
--- a/regex_patterns/D-Z0N3.yml
+++ b/regex_patterns/D-Z0N3.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])D-Z0N3\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/D3.yml b/regex_patterns/D3.yml
deleted file mode 100644
index 4a2c20c..0000000
--- a/regex_patterns/D3.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'D3'
-pattern: \b(D3)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/D4C.yml b/regex_patterns/D4C.yml
deleted file mode 100644
index 4df71f9..0000000
--- a/regex_patterns/D4C.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'D4C'
-pattern: \b(D4C)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/DARKFLiX.yml b/regex_patterns/DARKFLiX.yml
deleted file mode 100644
index 9155e7a..0000000
--- a/regex_patterns/DARKFLiX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DARKFLiX'
-pattern: \b(DARKFLiX)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DBArabic.yml b/regex_patterns/DBArabic.yml
deleted file mode 100644
index 4356812..0000000
--- a/regex_patterns/DBArabic.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DBArabic'
-pattern: \b(DBArabic)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DDR.yml b/regex_patterns/DDR.yml
deleted file mode 100644
index 2715970..0000000
--- a/regex_patterns/DDR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DDR
-pattern: ^(DDR)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/DEEP.yml b/regex_patterns/DEEP.yml
deleted file mode 100644
index 7877ef2..0000000
--- a/regex_patterns/DEEP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DEEP
-pattern: ^(DEEP)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DEFLATE (1).yml b/regex_patterns/DEFLATE (1).yml
deleted file mode 100644
index ba63d1a..0000000
--- a/regex_patterns/DEFLATE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'DEFLATE'
-'pattern': '(?<=^|[\s.-])DEFLATE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/DEFLATE.yml b/regex_patterns/DEFLATE.yml
index 99a7888..d0f50e1 100644
--- a/regex_patterns/DEFLATE.yml
+++ b/regex_patterns/DEFLATE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])DEFLATE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/DEPTH (1).yml b/regex_patterns/DEPTH (1).yml
deleted file mode 100644
index 28e0c6e..0000000
--- a/regex_patterns/DEPTH (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'DEPTH'
-'pattern': '(?<=^|[\s.-])DEPTH\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/DEPTH.yml b/regex_patterns/DEPTH.yml
index b636958..e7b0b1c 100644
--- a/regex_patterns/DEPTH.yml
+++ b/regex_patterns/DEPTH.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])DEPTH\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/DESPACiTO.yml b/regex_patterns/DESPACiTO.yml
deleted file mode 100644
index 4ad7b5d..0000000
--- a/regex_patterns/DESPACiTO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DESPACiTO
-pattern: (?<=^|[\s.-])DESPACiTO\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/DHD.yml b/regex_patterns/DHD.yml
deleted file mode 100644
index b075452..0000000
--- a/regex_patterns/DHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DHD'
-pattern: \b(DHD)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DKB.yml b/regex_patterns/DKB.yml
deleted file mode 100644
index fa3186b..0000000
--- a/regex_patterns/DKB.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DKB'
-pattern: \b(DKB)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DNL.yml b/regex_patterns/DNL.yml
deleted file mode 100644
index 7351596..0000000
--- a/regex_patterns/DNL.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DNL
-pattern: ^(DNL)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/DON (1).yml b/regex_patterns/DON (1).yml
deleted file mode 100644
index 3fac5fb..0000000
--- a/regex_patterns/DON (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'DON'
-'pattern': '(?<=^|[\s.-])DON\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/DON.yml b/regex_patterns/DON.yml
index 135c210..b481f16 100644
--- a/regex_patterns/DON.yml
+++ b/regex_patterns/DON.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])DON\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/DP.yml b/regex_patterns/DP.yml
deleted file mode 100644
index 01691d1..0000000
--- a/regex_patterns/DP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DP'
-pattern: \b(DP)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DRACULA.yml b/regex_patterns/DRACULA.yml
deleted file mode 100644
index 43e8c65..0000000
--- a/regex_patterns/DRACULA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DRACULA
-pattern: ^(DRACULA)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DTS (1).yml b/regex_patterns/DTS (1).yml
deleted file mode 100644
index 08d7b9b..0000000
--- a/regex_patterns/DTS (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'DTS'
-'pattern': '\bDTS(\b|\d)'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/DTS-HD (1).yml b/regex_patterns/DTS-HD (1).yml
deleted file mode 100644
index 64e920d..0000000
--- a/regex_patterns/DTS-HD (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'DTS-HD'
-'pattern': '\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))\b'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/DTS-HD HRA ES (1).yml b/regex_patterns/DTS-HD HRA ES (1).yml
deleted file mode 100644
index e6fe235..0000000
--- a/regex_patterns/DTS-HD HRA ES (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'DTS-HD HRA ES'
-'pattern': 'dts[-. ]?(es|(hd[. ]?)?(hr|hi))'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/DTS-HD HRA ES.yml b/regex_patterns/DTS-HD HRA ES.yml
index 47d12b2..beba323 100644
--- a/regex_patterns/DTS-HD HRA ES.yml	
+++ b/regex_patterns/DTS-HD HRA ES.yml	
@@ -1,5 +1,6 @@
 name: DTS-HD HRA ES
 pattern: dts[-. ]?(es|(hd[. ]?)?(hr|hi))
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/DTS-HD MA (1).yml b/regex_patterns/DTS-HD MA (1).yml
deleted file mode 100644
index 6facd65..0000000
--- a/regex_patterns/DTS-HD MA (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'DTS-HD MA'
-'pattern': '\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))(\b|\d)'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/DTS-HD MA.yml b/regex_patterns/DTS-HD MA.yml
index 83eeaca..419545d 100644
--- a/regex_patterns/DTS-HD MA.yml	
+++ b/regex_patterns/DTS-HD MA.yml	
@@ -1,5 +1,6 @@
 name: DTS-HD MA
-pattern: '\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))(\b|\d)'
+pattern: \b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))(\b|\d)
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/DTS-HD.yml b/regex_patterns/DTS-HD.yml
index d0ce76b..1ea1c88 100644
--- a/regex_patterns/DTS-HD.yml
+++ b/regex_patterns/DTS-HD.yml
@@ -1,5 +1,6 @@
 name: DTS-HD
 pattern: \b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))\b
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/DTS-X (1).yml b/regex_patterns/DTS-X (1).yml
deleted file mode 100644
index dcb912b..0000000
--- a/regex_patterns/DTS-X (1).yml	
+++ /dev/null
@@ -1,28 +0,0 @@
-'description': ''
-'name': 'DTS-X'
-'pattern': '\b(dts[-_. :]?x)\b(?!\d)'
-'tags':
-- 'Audio'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': '2 Fast 2 Furious (2003) 2160p MA WEB-DL H265 HDR DTS:X 7.1 English-FLUX'
-  'lastRun': '2025-01-16T15:29:55.783259'
-  'matchSpan':
-    'end': 54
-    'start': 49
-  'matchedContent': 'DTS:X'
-  'matchedGroups':
-  - 'DTS:X'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': '2.Fast.2.Furious.2003.2160p.MA.WEB-DL.DTS-X.7.1.H.265-FLUX.mkv'
-  'lastRun': '2025-01-16T15:29:55.783259'
-  'matchSpan':
-    'end': 43
-    'start': 38
-  'matchedContent': 'DTS-X'
-  'matchedGroups':
-  - 'DTS-X'
-  'passes': true
diff --git a/regex_patterns/DTS-X.yml b/regex_patterns/DTS-X.yml
index 5fd1875..85744a7 100644
--- a/regex_patterns/DTS-X.yml
+++ b/regex_patterns/DTS-X.yml
@@ -1,7 +1,8 @@
 name: DTS-X
 pattern: \b(dts[-_. :]?x)\b(?!\d)
 description: ''
-tags: []
+tags:
+- Audio
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/DTS.yml b/regex_patterns/DTS.yml
index 4b18c1e..fbee9c7 100644
--- a/regex_patterns/DTS.yml
+++ b/regex_patterns/DTS.yml
@@ -1,5 +1,6 @@
 name: DTS
 pattern: \bDTS(\b|\d)
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/DV-HDR10+.yml b/regex_patterns/DV-HDR10+.yml
deleted file mode 100644
index 11bebc3..0000000
--- a/regex_patterns/DV-HDR10+.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DV HDR10+'
-pattern: '^(?=.*\b(DV|DoVi|Dolby[ .]?V(ision)?)\b)(?=.*\b((HDR10(?=(P(lus)?)\b|\+))))'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DV-HDR10.yml b/regex_patterns/DV-HDR10.yml
deleted file mode 100644
index c5cd595..0000000
--- a/regex_patterns/DV-HDR10.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DV HDR10'
-pattern: '^(?=.*\\b(DV|DoVi|Dolby[ .]?V(ision)?)\\b)(?=.*\\b((HDR10(?!(P(lus)?)\\b|\\+))|(HDR))\\b)'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DV.yml b/regex_patterns/DV.yml
deleted file mode 100644
index 5017492..0000000
--- a/regex_patterns/DV.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DV'
-pattern: '\\b(dv|dovi|dolby[ .]?v(ision)?)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/DV_HLG.yml b/regex_patterns/DV_HLG.yml
deleted file mode 100644
index 9eec343..0000000
--- a/regex_patterns/DV_HLG.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DV HLG'
-pattern: '\\b(DV[ .]HLG)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DV_SDR.yml b/regex_patterns/DV_SDR.yml
deleted file mode 100644
index aa51633..0000000
--- a/regex_patterns/DV_SDR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DV SDR'
-pattern: '\\b(DV[ .]SDR)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Daddy-Raws.yml b/regex_patterns/Daddy-Raws.yml
deleted file mode 100644
index a298662..0000000
--- a/regex_patterns/Daddy-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Daddy-Raws'
-pattern: Daddy[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DaddySubs.yml b/regex_patterns/DaddySubs.yml
deleted file mode 100644
index 201e33f..0000000
--- a/regex_patterns/DaddySubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DaddySubs'
-pattern: \[Daddy(Subs)?\]|-Daddy(Subs)?\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Dae.yml b/regex_patterns/Dae.yml
deleted file mode 100644
index 22eeb40..0000000
--- a/regex_patterns/Dae.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Dae'
-pattern: \[Dae\]|-Dae\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DarQ.yml b/regex_patterns/DarQ.yml
index 3ffaf66..cdffd7f 100644
--- a/regex_patterns/DarQ.yml
+++ b/regex_patterns/DarQ.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'DarQ'
-'pattern': '(?<=^|[\s.-])DarQ\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: DarQ
+pattern: (?<=^|[\s.-])DarQ\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/Dariush (1).yml b/regex_patterns/Dariush (1).yml
deleted file mode 100644
index 2d84bf1..0000000
--- a/regex_patterns/Dariush (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Dariush'
-'pattern': '(?<=^|[\s.-])Dariush\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Dariush.yml b/regex_patterns/Dariush.yml
index 659e6fe..dafc6ff 100644
--- a/regex_patterns/Dariush.yml
+++ b/regex_patterns/Dariush.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Dariush\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Datte13.yml b/regex_patterns/Datte13.yml
deleted file mode 100644
index e4a4e67..0000000
--- a/regex_patterns/Datte13.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Datte13
-pattern: \b(Datte13)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Davinci.yml b/regex_patterns/Davinci.yml
deleted file mode 100644
index f20f04c..0000000
--- a/regex_patterns/Davinci.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Davinci'
-pattern: \[Davinci\]|-Davinci\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Deadmau-RAWS.yml b/regex_patterns/Deadmau-RAWS.yml
deleted file mode 100644
index 58bc551..0000000
--- a/regex_patterns/Deadmau-RAWS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Deadmau- RAWS'
-pattern: \b(Deadmau[ .-]?[ .-]?RAWS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Dekinai (1).yml b/regex_patterns/Dekinai (1).yml
deleted file mode 100644
index a61a617..0000000
--- a/regex_patterns/Dekinai (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Dekinai'
-'pattern': '(?<=^|[\s.-])Dekinai\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Dekinai.yml b/regex_patterns/Dekinai.yml
index 1f048f9..62b43eb 100644
--- a/regex_patterns/Dekinai.yml
+++ b/regex_patterns/Dekinai.yml
@@ -1,6 +1,7 @@
-name: 'Dekinai'
-pattern: \[Dekinai\]|-Dekinai\b
+name: Dekinai
+pattern: (?<=^|[\s.-])Dekinai\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/DepraveD (1).yml b/regex_patterns/DepraveD (1).yml
deleted file mode 100644
index 2657e0e..0000000
--- a/regex_patterns/DepraveD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'DepraveD'
-'pattern': '(?<=^|[\s.-])DepraveD\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/DepraveD.yml b/regex_patterns/DepraveD.yml
index 48fc241..746b9c5 100644
--- a/regex_patterns/DepraveD.yml
+++ b/regex_patterns/DepraveD.yml
@@ -1,6 +1,7 @@
-name: 'DepraveD'
-pattern: '^(DepraveD)$'
-description: ''
+name: DepraveD
+pattern: (?<=^|[\s.-])DepraveD\b
+description: Banned for Fake DV/HDR Layer
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/DiNAMiC.yml b/regex_patterns/DiNAMiC.yml
deleted file mode 100644
index c5b13fd..0000000
--- a/regex_patterns/DiNAMiC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DiNAMiC
-pattern: (?<=^|[\s.-])DiNAMiC\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Disney+ (1).yml b/regex_patterns/Disney+ (1).yml
deleted file mode 100644
index d2e5e87..0000000
--- a/regex_patterns/Disney+ (1).yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-'description': 'Disney+ is an American subscription video on-demand over-the-top streaming
-  media service that primarily distributes films and television shows produced by
-  Walt Disney Studios and Disney Television Studios, with dedicated content hubs for
-  Disney''s flagship brands; Disney, Pixar, Marvel, Star Wars, National Geographic,
-  ESPN, Hulu and Star.'
-'name': 'Disney+'
-'pattern': '\b(dsnp|dsny(p)?|disney\+)\s*\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Star Wars - The Clone Wars (2008) S06 (1080p DSNP WEB-DL H264 SDR DDP
-    5 1 English - HONE)'
-  'lastRun': '2024-12-03T16:25:40.465487'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Pupstruction S02E09E10 The Funniest Pup in Petsburg Beddy Bye Build 720p
-    DSNY WEB-DL AAC 2.0 H.264-4f8c4100292'
-  'lastRun': '2024-12-03T16:25:40.465487'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Once Upon a Snowman 2020 DSNYP 1080p WEBRip X264 Atmos-EVO'
-  'lastRun': '2024-12-03T16:25:40.465487'
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'How.Disney.Built.America.S01E01.1080p.WEB.h264-EDITH'
-  'lastRun': '2024-12-03T16:25:40.465487'
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'High School Musical - The Musical - The Series S00E01 The Special 2160p
-    HDR Disney+ WEBRip DD+ 5 1 x265-TrollUHD'
-  'lastRun': '2024-12-03T16:25:40.465487'
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'Air Crash Investigation S18 2018 Disney+ WEB-DL 1080p H264 DDP-HDCTV'
-  'lastRun': '2024-12-03T16:25:40.465487'
-  'passes': true
diff --git a/regex_patterns/Disney+.yml b/regex_patterns/Disney+.yml
index a67772b..c9f62ce 100644
--- a/regex_patterns/Disney+.yml
+++ b/regex_patterns/Disney+.yml
@@ -8,7 +8,6 @@ description: Disney+ is an American subscription video on-demand over-the-top st
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Doki (1).yml b/regex_patterns/Doki (1).yml
deleted file mode 100644
index e645ff7..0000000
--- a/regex_patterns/Doki (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Doki'
-'pattern': '(?<=^|[\s.-])Doki\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Doki.yml b/regex_patterns/Doki.yml
index fc33d7d..0963535 100644
--- a/regex_patterns/Doki.yml
+++ b/regex_patterns/Doki.yml
@@ -1,6 +1,7 @@
-name: 'Doki'
-pattern: \[Doki\]|-Doki\b
+name: Doki
+pattern: (?<=^|[\s.-])Doki\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Dolby Digital (1).yml b/regex_patterns/Dolby Digital (1).yml
deleted file mode 100644
index 1abc4c7..0000000
--- a/regex_patterns/Dolby Digital (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'Dolby Digital'
-'pattern': '\bDD[^a-z+]|(?<!e)ac3'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/Dolby Digital + (1).yml b/regex_patterns/Dolby Digital + (1).yml
deleted file mode 100644
index 5f55c5d..0000000
--- a/regex_patterns/Dolby Digital + (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'Dolby Digital +'
-'pattern': '\bDD[P+]|\b(e[-_. ]?ac3)\b'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/Dolby Digital +.yml b/regex_patterns/Dolby Digital +.yml
index a1690e0..634add8 100644
--- a/regex_patterns/Dolby Digital +.yml	
+++ b/regex_patterns/Dolby Digital +.yml	
@@ -1,5 +1,6 @@
 name: Dolby Digital +
 pattern: \bDD[P+]|\b(e[-_. ]?ac3)\b
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/Dolby Digital.yml b/regex_patterns/Dolby Digital.yml
index 05af74d..e93f77d 100644
--- a/regex_patterns/Dolby Digital.yml	
+++ b/regex_patterns/Dolby Digital.yml	
@@ -1,5 +1,6 @@
 name: Dolby Digital
 pattern: \bDD[^a-z+]|(?<!e)ac3
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/Dolby Vision (1).yml b/regex_patterns/Dolby Vision (1).yml
deleted file mode 100644
index 6448117..0000000
--- a/regex_patterns/Dolby Vision (1).yml	
+++ /dev/null
@@ -1,125 +0,0 @@
-'description': 'Dolby Vision is a high dynamic range (HDR) video format that uses
-  dynamic metadata to deliver enhanced brightness, contrast, and color on a scene-by-scene
-  or frame-by-frame basis, providing superior picture quality. This pattern excludes
-  matches where Dolby Vision is associated with SDR (Standard Dynamic Range) or HLG
-  (Hybrid Log-Gamma), ensuring it focuses on Dolby Vision-specific terms.'
-'name': 'Dolby Vision'
-'pattern': '\b(dv(?![ .](HLG|SDR))|dovi|dolby[ .]?vision)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'MovieName.2023.4K.DV.HDR.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 20
-    'start': 18
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'MovieName.2023.4K.Dovi.HDR10+.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 22
-    'start': 18
-  'matchedContent': 'Dovi'
-  'matchedGroups':
-  - 'Dovi'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'MovieName.2023.4K.Dolby.Vision.HDR.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 30
-    'start': 18
-  'matchedContent': 'Dolby.Vision'
-  'matchedGroups':
-  - 'Dolby.Vision'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'MovieName.2023.4K.DolbyVision.HDR10+.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 29
-    'start': 18
-  'matchedContent': 'DolbyVision'
-  'matchedGroups':
-  - 'DolbyVision'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'MovieName.1080p.DV.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 18
-    'start': 16
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'MovieName.4K.Dolby Vision.IMAX.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 25
-    'start': 13
-  'matchedContent': 'Dolby Vision'
-  'matchedGroups':
-  - 'Dolby Vision'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'MovieName.2023.4K.DV.HLG.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 8
-  'input': 'MovieName.2023.4K.DV.SDR.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'MovieName.4K.DV.SDR.Dovi.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 24
-    'start': 20
-  'matchedContent': 'Dovi'
-  'matchedGroups':
-  - 'Dovi'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Killers of the Flower Moon (2023) {tmdb-466420} [iT][WEBDL-2160p][DV HDR10Plus][EAC3
-    Atmos 5.1][h265]-FLUX.mkv'
-  'lastRun': '2025-06-18T11:54:00.452053'
-  'matchSpan':
-    'end': 68
-    'start': 66
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - 'DV'
-  - null
-  'passes': true
diff --git a/regex_patterns/Dolby Vision (Without Fallback) (1).yml b/regex_patterns/Dolby Vision (Without Fallback) (1).yml
deleted file mode 100644
index 92bb045..0000000
--- a/regex_patterns/Dolby Vision (Without Fallback) (1).yml	
+++ /dev/null
@@ -1,61 +0,0 @@
-'description': 'Matches Dolby Vision when it doesn''t come with regular HDR Fallback
-  (A Bluray Remux or a Hulu WEB-DL)'
-'name': 'Dolby Vision (Without Fallback)'
-'pattern': '(?<=^(?!.*(HDR|HULU|REMUX|BLURAY)).*?)\b(DV|Dovi|Dolby[- .]?V(ision)?)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'Barbie.2023.2160p.MA.WEB-DL.DDP5.1.Atmos.DV.HDR.H.265-FLUX'
-  'lastRun': '2025-06-18T11:54:10.281095'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': "\t Barbie (2023) (2160p AMZN WEB-DL Hybrid H265 DV HDR10+ DDP Atmos 5.1\
-    \ English - HONE)"
-  'lastRun': '2025-06-18T11:54:10.281095'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Barbie.2023.2160p.MA.WEB-DL.DDP5.1.Atmos.DV.H.265-FLUX'
-  'lastRun': '2025-06-18T11:54:10.281095'
-  'matchSpan':
-    'end': 43
-    'start': 41
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - null
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Barbie.2023.2160p.MA.WEB-DL.DDP5.1.Atmos.DV.H.265-FLUX.mkv'
-  'lastRun': '2025-06-18T11:54:10.281095'
-  'matchSpan':
-    'end': 43
-    'start': 41
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - null
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'Killers of the Flower Moon (2023) {tmdb-466420} [iT][WEBDL-2160p][DV HDR10Plus][EAC3
-    Atmos 5.1][h265]-FLUX.mkv'
-  'lastRun': '2025-06-18T11:54:10.281095'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Dolby Vision (Without Fallback).yml b/regex_patterns/Dolby Vision (Without Fallback).yml
index 7b18b33..75480cd 100644
--- a/regex_patterns/Dolby Vision (Without Fallback).yml	
+++ b/regex_patterns/Dolby Vision (Without Fallback).yml	
@@ -10,7 +10,7 @@ tests:
 - expected: false
   id: 1
   input: Barbie.2023.2160p.MA.WEB-DL.DDP5.1.Atmos.DV.HDR.H.265-FLUX
-  lastRun: '2024-12-13T09:54:37.318637'
+  lastRun: '2025-06-18T11:54:10.281095'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -19,7 +19,7 @@ tests:
   id: 2
   input: "\t Barbie (2023) (2160p AMZN WEB-DL Hybrid H265 DV HDR10+ DDP Atmos 5.1\
     \ English - HONE)"
-  lastRun: '2024-12-13T09:54:37.318637'
+  lastRun: '2025-06-18T11:54:10.281095'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -27,7 +27,7 @@ tests:
 - expected: true
   id: 3
   input: Barbie.2023.2160p.MA.WEB-DL.DDP5.1.Atmos.DV.H.265-FLUX
-  lastRun: '2024-12-13T09:54:37.318637'
+  lastRun: '2025-06-18T11:54:10.281095'
   matchSpan:
     end: 43
     start: 41
@@ -40,7 +40,7 @@ tests:
 - expected: true
   id: 4
   input: Barbie.2023.2160p.MA.WEB-DL.DDP5.1.Atmos.DV.H.265-FLUX.mkv
-  lastRun: '2024-12-13T09:54:37.318637'
+  lastRun: '2025-06-18T11:54:10.281095'
   matchSpan:
     end: 43
     start: 41
@@ -50,3 +50,12 @@ tests:
   - DV
   - null
   passes: true
+- expected: false
+  id: 5
+  input: Killers of the Flower Moon (2023) {tmdb-466420} [iT][WEBDL-2160p][DV HDR10Plus][EAC3
+    Atmos 5.1][h265]-FLUX.mkv
+  lastRun: '2025-06-18T11:54:10.281095'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
diff --git a/regex_patterns/Dolby Vision.yml b/regex_patterns/Dolby Vision.yml
index aceb140..b16afc4 100644
--- a/regex_patterns/Dolby Vision.yml	
+++ b/regex_patterns/Dolby Vision.yml	
@@ -13,7 +13,7 @@ tests:
 - expected: true
   id: 1
   input: MovieName.2023.4K.DV.HDR.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 20
     start: 18
@@ -25,7 +25,7 @@ tests:
 - expected: true
   id: 2
   input: MovieName.2023.4K.Dovi.HDR10+.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 22
     start: 18
@@ -37,7 +37,7 @@ tests:
 - expected: true
   id: 3
   input: MovieName.2023.4K.Dolby.Vision.HDR.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 30
     start: 18
@@ -49,7 +49,7 @@ tests:
 - expected: true
   id: 4
   input: MovieName.2023.4K.DolbyVision.HDR10+.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 29
     start: 18
@@ -61,7 +61,7 @@ tests:
 - expected: true
   id: 5
   input: MovieName.1080p.DV.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 18
     start: 16
@@ -73,7 +73,7 @@ tests:
 - expected: true
   id: 6
   input: MovieName.4K.Dolby Vision.IMAX.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 25
     start: 13
@@ -85,7 +85,7 @@ tests:
 - expected: false
   id: 7
   input: MovieName.2023.4K.DV.HLG.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -93,7 +93,7 @@ tests:
 - expected: false
   id: 8
   input: MovieName.2023.4K.DV.SDR.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -101,7 +101,7 @@ tests:
 - expected: true
   id: 9
   input: MovieName.4K.DV.SDR.Dovi.mkv
-  lastRun: '2024-12-13T09:06:01.845546'
+  lastRun: '2025-06-18T11:54:00.452053'
   matchSpan:
     end: 24
     start: 20
@@ -110,3 +110,16 @@ tests:
   - Dovi
   - null
   passes: true
+- expected: true
+  id: 10
+  input: Killers of the Flower Moon (2023) {tmdb-466420} [iT][WEBDL-2160p][DV HDR10Plus][EAC3
+    Atmos 5.1][h265]-FLUX.mkv
+  lastRun: '2025-06-18T11:54:00.452053'
+  matchSpan:
+    end: 68
+    start: 66
+  matchedContent: DV
+  matchedGroups:
+  - DV
+  - null
+  passes: true
diff --git a/regex_patterns/Drag (1).yml b/regex_patterns/Drag (1).yml
deleted file mode 100644
index 9708530..0000000
--- a/regex_patterns/Drag (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Drag'
-'pattern': '(?<=^|[\s.-])Drag\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Drag.yml b/regex_patterns/Drag.yml
index d193cbc..bd9be5c 100644
--- a/regex_patterns/Drag.yml
+++ b/regex_patterns/Drag.yml
@@ -1,6 +1,7 @@
 name: Drag
-pattern: \[Drag\]|-Drag\b
+pattern: (?<=^|[\s.-])Drag\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Dragon-Releases.yml b/regex_patterns/Dragon-Releases.yml
deleted file mode 100644
index 6c7f3ce..0000000
--- a/regex_patterns/Dragon-Releases.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Dragon-Releases'
-pattern: \b(Dragon-Releases)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/DragsterPS.yml b/regex_patterns/DragsterPS.yml
deleted file mode 100644
index d9e63d7..0000000
--- a/regex_patterns/DragsterPS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DragsterPS'
-pattern: \b(DragsterPS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/DsunS.yml b/regex_patterns/DsunS.yml
deleted file mode 100644
index e61234c..0000000
--- a/regex_patterns/DsunS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'DsunS'
-pattern: \b(DsunS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Dual Audio (1).yml b/regex_patterns/Dual Audio (1).yml
deleted file mode 100644
index 90025fb..0000000
--- a/regex_patterns/Dual Audio (1).yml	
+++ /dev/null
@@ -1,116 +0,0 @@
-'description': 'Matches releases with Dual Audio; Media releases that contain two
-  language tracks - typically the original language (such as Japanese) along with
-  an English dub, allowing viewers to switch between either audio track while watching
-  the same video content.'
-'name': 'Dual Audio'
-'pattern': '\b((multi[^a-zA-Z]*)|(dual[\s.-](audio|complete)))\b'
-'tags': []
-'tests':
-- 'expected': true
-  'id': 1
-  'input': "\t The.Hunger.Games.2012.MULTi.1080p.BluRay.DTS.HD.MA.x264-HeavyWeight"
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan':
-    'end': 30
-    'start': 24
-  'matchedContent': 'MULTi.'
-  'matchedGroups':
-  - 'MULTi.'
-  - 'MULTi.'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'The.Hunger.Games.2012.1080p.AMZN.WEB-DL.Multi.DDP5.1.H.264-DHRUB_DXD'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan':
-    'end': 46
-    'start': 40
-  'matchedContent': 'Multi.'
-  'matchedGroups':
-  - 'Multi.'
-  - 'Multi.'
-  - null
-  - null
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'We Don''t Die, We Multiply: The Robin Harris Story'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Cyberpunk 2077 Phantom Liberty MULTi19 v2 2 DINOByTES'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan':
-    'end': 39
-    'start': 31
-  'matchedContent': 'MULTi19 '
-  'matchedGroups':
-  - 'MULTi19 '
-  - 'MULTi19 '
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Attack on Titan S04 2020 1080p USA Blu-ray AVC TrueHD 5.1 Dual Audio -ZR-'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan':
-    'end': 68
-    'start': 58
-  'matchedContent': 'Dual Audio'
-  'matchedGroups':
-  - 'Dual Audio'
-  - null
-  - 'Dual Audio'
-  - 'Audio'
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'DanMachi Sword Oratoria Vol 01-04 2017 ANiME DUAL COMPLETE BLURAY-iFPD'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan':
-    'end': 58
-    'start': 45
-  'matchedContent': 'DUAL COMPLETE'
-  'matchedGroups':
-  - 'DUAL COMPLETE'
-  - null
-  - 'DUAL COMPLETE'
-  - 'COMPLETE'
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': 'Bleach.S12.1080p.BluRay.REMUX.AVC.Dual-Audio.DTS-HD.MA.2.0-ZR-'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan':
-    'end': 44
-    'start': 34
-  'matchedContent': 'Dual-Audio'
-  'matchedGroups':
-  - 'Dual-Audio'
-  - null
-  - 'Dual-Audio'
-  - 'Audio'
-  'passes': true
-- 'expected': false
-  'id': 8
-  'input': 'Dual.2022.1080p.BluRay.DDP5.1.x264-iFT.mkv'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 9
-  'input': 'uality.A.Graffiti.Story.2022.1080p.WEB.H264-AEROHOLiCS.mkv'
-  'lastRun': '2024-12-18T11:58:49.979470'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Dubbed.yml b/regex_patterns/Dubbed.yml
deleted file mode 100644
index c4d0b72..0000000
--- a/regex_patterns/Dubbed.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Dubbed
-pattern: ^(?!.*(Dual|Multi)[-_. ]?Audio).*((?<!multi-)\b(dub(bed)?)\b|(funi|eng(lish)?)_?dub)
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/E.N.D (1).yml b/regex_patterns/E.N.D (1).yml
deleted file mode 100644
index 48c427f..0000000
--- a/regex_patterns/E.N.D (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'E.N.D'
-'pattern': '(?<=^|[\s.-])E.N.D\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/E.N.D.yml b/regex_patterns/E.N.D.yml
index f6c955a..dbfc712 100644
--- a/regex_patterns/E.N.D.yml
+++ b/regex_patterns/E.N.D.yml
@@ -1,6 +1,7 @@
-name: 'E.N.D'
+name: E.N.D
 pattern: (?<=^|[\s.-])E.N.D\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/E1 (1).yml b/regex_patterns/E1 (1).yml
deleted file mode 100644
index a3d0229..0000000
--- a/regex_patterns/E1 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'E1'
-'pattern': '(?<=^|[\s.-])E1\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/E1.yml b/regex_patterns/E1.yml
index b74fd5a..efcbacf 100644
--- a/regex_patterns/E1.yml
+++ b/regex_patterns/E1.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])E1\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/EA (1).yml b/regex_patterns/EA (1).yml
deleted file mode 100644
index 6df1e8b..0000000
--- a/regex_patterns/EA (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EA'
-'pattern': '(?<=^|[\s.-])EA\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/EA.yml b/regex_patterns/EA.yml
index 5c83a5e..bbcd6bf 100644
--- a/regex_patterns/EA.yml
+++ b/regex_patterns/EA.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])EA\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/EDPH (1).yml b/regex_patterns/EDPH (1).yml
deleted file mode 100644
index d3b2927..0000000
--- a/regex_patterns/EDPH (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EDPH'
-'pattern': '(?<=^|[\s.-])EDPH\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/EDPH.yml b/regex_patterns/EDPH.yml
index 8225e0a..80a3e0b 100644
--- a/regex_patterns/EDPH.yml
+++ b/regex_patterns/EDPH.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])EDPH\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/EJF.yml b/regex_patterns/EJF.yml
deleted file mode 100644
index abb9e50..0000000
--- a/regex_patterns/EJF.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'EJF'
-pattern: \b(EJF)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/EMERALD (1).yml b/regex_patterns/EMERALD (1).yml
deleted file mode 100644
index 53250c5..0000000
--- a/regex_patterns/EMERALD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EMERALD'
-'pattern': '(?<=^|[\s.-])EMERALD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/EMERALD.yml b/regex_patterns/EMERALD.yml
index cc3bc33..cefe2a6 100644
--- a/regex_patterns/EMERALD.yml
+++ b/regex_patterns/EMERALD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])EMERALD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/END.yml b/regex_patterns/END.yml
deleted file mode 100644
index 673c5d6..0000000
--- a/regex_patterns/END.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: END
-pattern: ^(END)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ENDSTATiON.yml b/regex_patterns/ENDSTATiON.yml
deleted file mode 100644
index 19b41c9..0000000
--- a/regex_patterns/ENDSTATiON.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ENDSTATiON
-pattern: (?<=^|[\s.-])ENDSTATiON\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/EPSiLON (1).yml b/regex_patterns/EPSiLON (1).yml
deleted file mode 100644
index 6859a1c..0000000
--- a/regex_patterns/EPSiLON (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EPSiLON'
-'pattern': '(?<=^|[\s.-])EPSiLON\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/EPSiLON.yml b/regex_patterns/EPSiLON.yml
index 39cf41c..e038d08 100644
--- a/regex_patterns/EPSiLON.yml
+++ b/regex_patterns/EPSiLON.yml
@@ -1,6 +1,7 @@
 name: EPSiLON
-pattern: ^(EPSiLON)$
+pattern: (?<=^|[\s.-])EPSiLON\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/EPiC.yml b/regex_patterns/EPiC.yml
deleted file mode 100644
index 45636fe..0000000
--- a/regex_patterns/EPiC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: EPiC
-pattern: ^(EPiC)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/ESiR (1).yml b/regex_patterns/ESiR (1).yml
deleted file mode 100644
index 7fd86da..0000000
--- a/regex_patterns/ESiR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ESiR'
-'pattern': '(?<=^|[\s.-])ESiR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ESiR.yml b/regex_patterns/ESiR.yml
index a5a10b6..4c0702a 100644
--- a/regex_patterns/ESiR.yml
+++ b/regex_patterns/ESiR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ESiR\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/ETHiCS.yml b/regex_patterns/ETHiCS.yml
deleted file mode 100644
index 242c98f..0000000
--- a/regex_patterns/ETHiCS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ETHiCS
-pattern: ^(ETHiCS)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/EVO (1).yml b/regex_patterns/EVO (1).yml
deleted file mode 100644
index b0ca21c..0000000
--- a/regex_patterns/EVO (1).yml	
+++ /dev/null
@@ -1,28 +0,0 @@
-'description': 'iPT Internal known for releasing pre-releases before anyone else.
-  Also releases encodes of varying quality. '
-'name': 'EVO'
-'pattern': '(?<=^|[\s.-])EVO\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Aisha 2022 1080p WEB-DL DDP5 1 H 264-EVO'
-  'lastRun': '2024-12-06T05:54:51.925977'
-  'matchSpan':
-    'end': 40
-    'start': 37
-  'matchedContent': 'EVO'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Dune AKA Dune: Part One 2021 1080p EUR Blu-ray AVC TrueHD 7.1 Atmos-EVO'
-  'lastRun': '2024-12-06T05:54:51.925977'
-  'matchSpan':
-    'end': 71
-    'start': 68
-  'matchedContent': 'EVO'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/EVO.yml b/regex_patterns/EVO.yml
index 4055380..098591d 100644
--- a/regex_patterns/EVO.yml
+++ b/regex_patterns/EVO.yml
@@ -4,8 +4,7 @@ description: 'iPT Internal known for releasing pre-releases before anyone else.
   releases encodes of varying quality. '
 tags:
 - Release Group
-- iPT
-- Disbanded
+- WEB-DL
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/EX-R.yml b/regex_patterns/EX-R.yml
deleted file mode 100644
index 0b0f26c..0000000
--- a/regex_patterns/EX-R.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: EX-R
-pattern: (?<=^|[\s.-])EX-R\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/EXCiSION (1).yml b/regex_patterns/EXCiSION (1).yml
deleted file mode 100644
index c8de5a9..0000000
--- a/regex_patterns/EXCiSION (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EXCiSION'
-'pattern': '(?<=^|[\s.-])EXCiSION\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/EXCiSION.yml b/regex_patterns/EXCiSION.yml
index 698aacb..321f951 100644
--- a/regex_patterns/EXCiSION.yml
+++ b/regex_patterns/EXCiSION.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])EXCiSION\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/EXP (1).yml b/regex_patterns/EXP (1).yml
deleted file mode 100644
index 87a259b..0000000
--- a/regex_patterns/EXP (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EXP'
-'pattern': '(?<=^|[\s.-])EXP\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/EXP.yml b/regex_patterns/EXP.yml
index 1f811b1..5b0765e 100644
--- a/regex_patterns/EXP.yml
+++ b/regex_patterns/EXP.yml
@@ -1,6 +1,7 @@
-name: 'EXP'
-pattern: \[EXP\]|-EXP\b
+name: EXP
+pattern: (?<=^|[\s.-])EXP\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/EbP (1).yml b/regex_patterns/EbP (1).yml
deleted file mode 100644
index f8c85e9..0000000
--- a/regex_patterns/EbP (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'EbP'
-'pattern': '(?<=^|[\s.-])EbP\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/EbP.yml b/regex_patterns/EbP.yml
index 563cc1c..48e7d55 100644
--- a/regex_patterns/EbP.yml
+++ b/regex_patterns/EbP.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])EbP\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Erai-Raws (1).yml b/regex_patterns/Erai-Raws (1).yml
deleted file mode 100644
index ec7e864..0000000
--- a/regex_patterns/Erai-Raws (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Erai-Raws'
-'pattern': '(?<=^|[\s.-])Erai-Raws\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Erai-Raws.yml b/regex_patterns/Erai-Raws.yml
index d1d9875..b5fde81 100644
--- a/regex_patterns/Erai-Raws.yml
+++ b/regex_patterns/Erai-Raws.yml
@@ -1,6 +1,7 @@
-name: 'Erai-Raws'
-pattern: \b(Erai-raws)\b
+name: Erai-Raws
+pattern: (?<=^|[\s.-])Erai-Raws\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/EuReKA.yml b/regex_patterns/EuReKA.yml
deleted file mode 100644
index 25c2557..0000000
--- a/regex_patterns/EuReKA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: EuReKA
-pattern: ^(EuReKA)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/ExREN.yml b/regex_patterns/ExREN.yml
deleted file mode 100644
index 0f6e4a0..0000000
--- a/regex_patterns/ExREN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ExREN'
-pattern: \b(ExREN)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Exiled-Destiny (1).yml b/regex_patterns/Exiled-Destiny (1).yml
deleted file mode 100644
index ee92ca3..0000000
--- a/regex_patterns/Exiled-Destiny (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Exiled-Destiny'
-'pattern': '(?<=^|[\s.-])Exiled-Destiny\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Exiled-Destiny.yml b/regex_patterns/Exiled-Destiny.yml
index 48bcbf4..07dc3dc 100644
--- a/regex_patterns/Exiled-Destiny.yml
+++ b/regex_patterns/Exiled-Destiny.yml
@@ -1,6 +1,7 @@
-name: 'Exiled-Destiny'
-pattern: \b(Exiled-Destiny|E-D)\b
+name: Exiled-Destiny
+pattern: (?<=^|[\s.-])Exiled-Destiny\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Extended Clip (1).yml b/regex_patterns/Extended Clip (1).yml
deleted file mode 100644
index 009ce22..0000000
--- a/regex_patterns/Extended Clip (1).yml	
+++ /dev/null
@@ -1,30 +0,0 @@
-'description': 'Matches preview releases labelled as `Extended Clip`'
-'name': 'Extended Clip'
-'pattern': '\b(extended.?clip)\b'
-'tags':
-- 'Preview'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Killers Of The Flower Moon 2023 Extended Clip 1080p AMZN WEB-DL DDP 5.1
-    H 264-FLUX'
-  'lastRun': '2025-02-25T22:09:00.135768'
-  'matchSpan':
-    'end': 45
-    'start': 32
-  'matchedContent': 'Extended Clip'
-  'matchedGroups':
-  - 'Extended Clip'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Killers.of.The.Flower.Moon.2023.Extended.Clip.1080p.AMZN.WEB-DL.DDP5.1.H.264-FLUX'
-  'lastRun': '2025-02-25T22:09:00.135768'
-  'matchSpan':
-    'end': 45
-    'start': 32
-  'matchedContent': 'Extended.Clip'
-  'matchedGroups':
-  - 'Extended.Clip'
-  'passes': true
diff --git a/regex_patterns/Extended Clip.yml b/regex_patterns/Extended Clip.yml
index 5b735f7..051c98b 100644
--- a/regex_patterns/Extended Clip.yml	
+++ b/regex_patterns/Extended Clip.yml	
@@ -3,7 +3,7 @@ pattern: \b(extended.?clip)\b
 description: Matches preview releases labelled as `Extended Clip`
 tags:
 - Preview
-- Unwanted
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Extras (1).yml b/regex_patterns/Extras (1).yml
deleted file mode 100644
index 2c843d5..0000000
--- a/regex_patterns/Extras (1).yml	
+++ /dev/null
@@ -1,15 +0,0 @@
-'description': 'Extras, Special Features, Featurettes, etc'
-'name': 'Extras'
-'pattern': '(?i)(?<=\b[12]\d{3}\b).*(\b|\.)\b(Extras?|Bonus|Extended[ ._-]Clip|Special
-  Feature[s]?)\b'
-'tags':
-- 'UnWanted'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'E.T..el.ExtraTerrestre.30.Aniversario.1982.mHD.10Bits.1080p.BluRay.DD5.1.HEVC-TMd.mkv'
-  'lastRun': '2025-02-07T06:19:53.936128'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Extras.yml b/regex_patterns/Extras.yml
index 7315805..dbd4d86 100644
--- a/regex_patterns/Extras.yml
+++ b/regex_patterns/Extras.yml
@@ -3,8 +3,7 @@ pattern: (?i)(?<=\b[12]\d{3}\b).*(\b|\.)\b(Extras?|Bonus|Extended[ ._-]Clip|Spec
   Feature[s]?)\b
 description: Extras, Special Features, Featurettes, etc
 tags:
-- Unwanted
-- Extras
+- UnWanted
 tests:
 - expected: false
   id: 1
diff --git a/regex_patterns/FAV.yml b/regex_patterns/FAV.yml
deleted file mode 100644
index 9531d93..0000000
--- a/regex_patterns/FAV.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'FAV'
-pattern: \[FAV\]|-FAV\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/FC.yml b/regex_patterns/FC.yml
deleted file mode 100644
index b45af89..0000000
--- a/regex_patterns/FC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: FC
-pattern: ^(FC)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/FFF (1).yml b/regex_patterns/FFF (1).yml
deleted file mode 100644
index c2cc469..0000000
--- a/regex_patterns/FFF (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FFF'
-'pattern': '(?<=^|[\s.-])FFF\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/FFF.yml b/regex_patterns/FFF.yml
index 72ae498..c867601 100644
--- a/regex_patterns/FFF.yml
+++ b/regex_patterns/FFF.yml
@@ -1,6 +1,7 @@
-name: 'FFF'
-pattern: \b(FFF)\b
+name: FFF
+pattern: (?<=^|[\s.-])FFF\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/FGT (1).yml b/regex_patterns/FGT (1).yml
deleted file mode 100644
index 1b1dfee..0000000
--- a/regex_patterns/FGT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Retagging'
-'name': 'FGT'
-'pattern': '(?<=^|[\s.-])FGT\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/FGT.yml b/regex_patterns/FGT.yml
index 8377975..bcad707 100644
--- a/regex_patterns/FGT.yml
+++ b/regex_patterns/FGT.yml
@@ -1,6 +1,7 @@
 name: FGT
-pattern: ^(FGT)$
-description: ''
+pattern: (?<=^|[\s.-])FGT\b
+description: Banned for Retagging
 tags:
 - Release Group
-tests: null
\ No newline at end of file
+- UnWanted
+tests: []
diff --git a/regex_patterns/FLAC (1).yml b/regex_patterns/FLAC (1).yml
deleted file mode 100644
index 3aa8445..0000000
--- a/regex_patterns/FLAC (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'FLAC'
-'pattern': '\bFLAC(\b|\d)'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/FLAC.yml b/regex_patterns/FLAC.yml
index 3c1c3da..1ba77f6 100644
--- a/regex_patterns/FLAC.yml
+++ b/regex_patterns/FLAC.yml
@@ -1,5 +1,6 @@
 name: FLAC
 pattern: \bFLAC(\b|\d)
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/FLAME (1).yml b/regex_patterns/FLAME (1).yml
deleted file mode 100644
index 949e595..0000000
--- a/regex_patterns/FLAME (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FLAME'
-'pattern': '(?<=^|[\s.-])FLAME\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/FLAME.yml b/regex_patterns/FLAME.yml
index 46577e9..458c63e 100644
--- a/regex_patterns/FLAME.yml
+++ b/regex_patterns/FLAME.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FLAME\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/FLFL.yml b/regex_patterns/FLFL.yml
deleted file mode 100644
index 1270d02..0000000
--- a/regex_patterns/FLFL.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: FLFL
-pattern: \b(FLFL)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/FLUX (1).yml b/regex_patterns/FLUX (1).yml
deleted file mode 100644
index 99ad2b1..0000000
--- a/regex_patterns/FLUX (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FLUX'
-'pattern': '(?<=^|[\s.-])FLUX\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/FLUX.yml b/regex_patterns/FLUX.yml
index f5150d5..3384700 100644
--- a/regex_patterns/FLUX.yml
+++ b/regex_patterns/FLUX.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FLUX\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/FMD.yml b/regex_patterns/FMD.yml
deleted file mode 100644
index f9ce0fc..0000000
--- a/regex_patterns/FMD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: FMD
-pattern: ^(FMD)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/FRDS (1).yml b/regex_patterns/FRDS (1).yml
deleted file mode 100644
index 61f23b8..0000000
--- a/regex_patterns/FRDS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FRDS'
-'pattern': '(?<=^|[\s.-])FRDS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/FRDS.yml b/regex_patterns/FRDS.yml
index 456918c..8832936 100644
--- a/regex_patterns/FRDS.yml
+++ b/regex_patterns/FRDS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FRDS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/FTW-HD (1).yml b/regex_patterns/FTW-HD (1).yml
deleted file mode 100644
index 1615c7d..0000000
--- a/regex_patterns/FTW-HD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FTW-HD'
-'pattern': '(?<=^|[\s.-])FTW-HD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/FTW-HD.yml b/regex_patterns/FTW-HD.yml
index e5723bc..7551328 100644
--- a/regex_patterns/FTW-HD.yml
+++ b/regex_patterns/FTW-HD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FTW-HD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/FZHD.yml b/regex_patterns/FZHD.yml
deleted file mode 100644
index 588bba5..0000000
--- a/regex_patterns/FZHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: FZHD
-pattern: (?<=^|[\s.-])FZHD\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/FaNGDiNG0.yml b/regex_patterns/FaNGDiNG0.yml
deleted file mode 100644
index 1676a48..0000000
--- a/regex_patterns/FaNGDiNG0.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: FaNGDiNG0
-pattern: ^(FaNGDiNG0)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/Feranki1980.yml b/regex_patterns/Feranki1980.yml
deleted file mode 100644
index b24bcc6..0000000
--- a/regex_patterns/Feranki1980.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Feranki1980
-pattern: ^(Feranki1980)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/FilmHD (1).yml b/regex_patterns/FilmHD (1).yml
deleted file mode 100644
index 2959cd3..0000000
--- a/regex_patterns/FilmHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FilmHD'
-'pattern': '(?<=^|[\s.-])FilmHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/FilmHD.yml b/regex_patterns/FilmHD.yml
index 6af051e..53f9359 100644
--- a/regex_patterns/FilmHD.yml
+++ b/regex_patterns/FilmHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FilmHD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Final8 (1).yml b/regex_patterns/Final8 (1).yml
deleted file mode 100644
index 25dc8fa..0000000
--- a/regex_patterns/Final8 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Final8'
-'pattern': '(?<=^|[\s.-])Final8\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Final8.yml b/regex_patterns/Final8.yml
index e15e98e..da71ee9 100644
--- a/regex_patterns/Final8.yml
+++ b/regex_patterns/Final8.yml
@@ -1,6 +1,7 @@
-name: 'Final8'
-pattern: \b(Final8)\b
+name: Final8
+pattern: (?<=^|[\s.-])Final8\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Fish.yml b/regex_patterns/Fish.yml
deleted file mode 100644
index c620a24..0000000
--- a/regex_patterns/Fish.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Fish'
-pattern: \b((Baked|Dead|Space)Fish)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Flights (1).yml b/regex_patterns/Flights (1).yml
deleted file mode 100644
index bf98d02..0000000
--- a/regex_patterns/Flights (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'Flights'
-'pattern': '(?<=^|[\s.-])Flights\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/Flights.yml b/regex_patterns/Flights.yml
index ecb9bf8..1654666 100644
--- a/regex_patterns/Flights.yml
+++ b/regex_patterns/Flights.yml
@@ -1,6 +1,7 @@
 name: Flights
-pattern: ^(Flights)$
-description: ''
+pattern: (?<=^|[\s.-])Flights\b
+description: Banned for Fake DV/HDR Layer
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/Flugel.yml b/regex_patterns/Flugel.yml
index 8c7eddf..d82181c 100644
--- a/regex_patterns/Flugel.yml
+++ b/regex_patterns/Flugel.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'Flugel'
-'pattern': '(?<=^|[\s.-])Flugel\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
+name: Flugel
+pattern: (?<=^|[\s.-])Flugel\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/FoRM (1).yml b/regex_patterns/FoRM (1).yml
deleted file mode 100644
index 0115e28..0000000
--- a/regex_patterns/FoRM (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FoRM'
-'pattern': '(?<=^|[\s.-])FoRM\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/FoRM.yml b/regex_patterns/FoRM.yml
index 853571c..84acfe5 100644
--- a/regex_patterns/FoRM.yml
+++ b/regex_patterns/FoRM.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FoRM\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Foxtrot.yml b/regex_patterns/Foxtrot.yml
deleted file mode 100644
index 1e5f3b6..0000000
--- a/regex_patterns/Foxtrot.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Foxtrot'
-pattern: \[Foxtrot\]|-Foxtrot\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/FraMeSToR (1).yml b/regex_patterns/FraMeSToR (1).yml
deleted file mode 100644
index a2a831f..0000000
--- a/regex_patterns/FraMeSToR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'FraMeSToR'
-'pattern': '(?<=^|[\s.-])FraMeSToR\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/FraMeSToR.yml b/regex_patterns/FraMeSToR.yml
index 0d747d8..d0f22d0 100644
--- a/regex_patterns/FraMeSToR.yml
+++ b/regex_patterns/FraMeSToR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])FraMeSToR\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/Full Disc (1).yml b/regex_patterns/Full Disc (1).yml
deleted file mode 100644
index b0afaee..0000000
--- a/regex_patterns/Full Disc (1).yml	
+++ /dev/null
@@ -1,192 +0,0 @@
-'description': 'A Full Disc release refers to a complete copy of a physical media
-  disc, such as a DVD or Blu-ray, preserving all original content including menus,
-  bonus features, and multiple audio or subtitle tracks. Unlike compressed or re-encoded
-  formats, Full Disc files maintain the full structure and quality of the original
-  disc, often stored as ISO files or folders like BDMV for Blu-rays. These releases
-  are ideal for users seeking an authentic, unaltered experience identical to using
-  the physical disc.'
-'name': 'Full Disc'
-'pattern': '^(?!.*\b((?<!HD[._ -]|HD)DVD|BDRip|MKV|XviD|WMV|d3g|BDREMUX|REMUX|^(?=.*1080p)(?=.*HEVC)|[xh][-_.
-  ]?26[45]|German.*DL|((?<=\d{4}).*German.*(DL)?)(?=.*\b(AVC|HEVC|VC[-_. ]?1|MVC|MPEG[-_.
-  ]?2)\b))\b)(((?=.*\b(Blu[-_. ]?ray|BD|HD[-_. ]?DVD)\b)(?=.*\b(AVC|HEVC|VC[-_. ]?1|MVC|MPEG[-_.
-  ]?2|BDMV|ISO)\b))|^((?=.*\b(^((?=.*\b((.*_)?COMPLETE.*|Dis[ck])\b)(?=.*(Blu[-_.
-  ]?ray|HD[-_. ]?DVD)))|3D[-_. ]?BD|BR[-_. ]?DISK|Full[-_. ]?Blu[-_. ]?ray|^((?=.*((BD|UHD)[-_.
-  ]?(25|50|66|100|ISO)))))))).*|(?i)(DVD9|DVD5|NTSC|PAL|VOB IFO|VC-1|AVC|MPEG-2|\bCOMPLETE[-.\s]?(?:UHD[-.\s])?BLU[-.\s]?RAY\b|\bCOMPLETE
-  BLURAY\b|\bBR-Disk\b)'
-'tags':
-- 'Storage'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Bleach.S14.NTSC.DVD.LPCM2.0-NOGRP'
-  'lastRun': '2024-12-08T22:54:52.791014'
-  'matchSpan':
-    'end': 15
-    'start': 11
-  'matchedContent': 'NTSC'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - 'NTSC'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': "The Prisoner 2009 S01 1080i Blu-ray AVC DTS-HD MA 5.1-CultFilms\u2122"
-  'lastRun': '2024-12-08T22:54:52.791014'
-  'matchSpan':
-    'end': 64
-    'start': 0
-  'matchedContent': "The Prisoner 2009 S01 1080i Blu-ray AVC DTS-HD MA 5.1-CultFilms\u2122"
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - ''
-  - ''
-  - 'Blu-ray'
-  - 'AVC'
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Scissor.Penis.2018.1080i.Blu-ray.AVC.DTS-HD.MA.2.0'
-  'lastRun': '2024-12-08T22:54:52.791014'
-  'matchSpan':
-    'end': 50
-    'start': 0
-  'matchedContent': 'Scissor.Penis.2018.1080i.Blu-ray.AVC.DTS-HD.MA.2.0'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - ''
-  - ''
-  - 'Blu-ray'
-  - 'AVC'
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': "Heaven's Prisoners 1996 1080p AUS Blu-ray AVC LPCM 2.0-CultFilms\u2122"
-  'lastRun': '2024-12-08T22:54:52.791014'
-  'matchSpan':
-    'end': 65
-    'start': 0
-  'matchedContent': "Heaven's Prisoners 1996 1080p AUS Blu-ray AVC LPCM 2.0-CultFilms\u2122"
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - ''
-  - ''
-  - 'Blu-ray'
-  - 'AVC'
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Hors-saison.2024.VOF.1080p.FRA.BluRay.AVC.DTS-HD.MA.5.1-RyanHG'
-  'lastRun': '2024-12-08T22:54:52.791014'
-  'matchSpan':
-    'end': 62
-    'start': 0
-  'matchedContent': 'Hors-saison.2024.VOF.1080p.FRA.BluRay.AVC.DTS-HD.MA.5.1-RyanHG'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - ''
-  - ''
-  - 'BluRay'
-  - 'AVC'
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'El.Aviso.2018.SPANiSH.COMPLETE.BLURAY-CEBCOM'
-  'lastRun': '2024-12-08T22:54:52.791014'
-  'matchSpan':
-    'end': 44
-    'start': 0
-  'matchedContent': 'El.Aviso.2018.SPANiSH.COMPLETE.BLURAY-CEBCOM'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - ''
-  - null
-  - null
-  - null
-  - ''
-  - ''
-  - ''
-  - 'COMPLETE.BLURAY-CEBCOM'
-  - null
-  - 'BLURAY'
-  - null
-  - null
-  - null
-  - null
-  - null
-  'passes': true
diff --git a/regex_patterns/Fumi-Raws.yml b/regex_patterns/Fumi-Raws.yml
deleted file mode 100644
index 5a37bd5..0000000
--- a/regex_patterns/Fumi-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Fumi-Raws'
-pattern: Fumi[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/FunArts.yml b/regex_patterns/FunArts.yml
deleted file mode 100644
index 2c118f3..0000000
--- a/regex_patterns/FunArts.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'FunArts'
-pattern: \b(FunArts)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GALAXY (1).yml b/regex_patterns/GALAXY (1).yml
deleted file mode 100644
index d3ff4c5..0000000
--- a/regex_patterns/GALAXY (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'GALAXY'
-'pattern': '(?<=^|[\s.-])GALAXY\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/GALAXY.yml b/regex_patterns/GALAXY.yml
index 1ba399e..4d079b5 100644
--- a/regex_patterns/GALAXY.yml
+++ b/regex_patterns/GALAXY.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])GALAXY\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/GERMini.yml b/regex_patterns/GERMini.yml
deleted file mode 100644
index 9a3b259..0000000
--- a/regex_patterns/GERMini.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GERMini'
-pattern: \b(GERMini)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GHD.yml b/regex_patterns/GHD.yml
deleted file mode 100644
index 6ff8ea6..0000000
--- a/regex_patterns/GHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: GHD
-pattern: ^(GHD)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/GHS.yml b/regex_patterns/GHS.yml
deleted file mode 100644
index 5c4b27f..0000000
--- a/regex_patterns/GHS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GHS'
-pattern: \b(GHS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GNOME (1).yml b/regex_patterns/GNOME (1).yml
deleted file mode 100644
index 64ef51d..0000000
--- a/regex_patterns/GNOME (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "GNOME" when preceded by whitespace, a hyphen or dot'
-'name': 'GNOME'
-'pattern': '(?<=^|[\s.-])GNOME\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/GNOME.yml b/regex_patterns/GNOME.yml
index b3ff2d9..d0ee47a 100644
--- a/regex_patterns/GNOME.yml
+++ b/regex_patterns/GNOME.yml
@@ -1,7 +1,7 @@
-name: 'GNOME'
-pattern: "^(GNOME)$"
-description: ''
+name: GNOME
+pattern: (?<=^|[\s.-])GNOME\b
+description: Matches "GNOME" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
-- TRaSH
+- WEB-DL
 tests: []
diff --git a/regex_patterns/GNOMiSSiON.yml b/regex_patterns/GNOMiSSiON.yml
deleted file mode 100644
index 4e086f0..0000000
--- a/regex_patterns/GNOMiSSiON.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GNOMiSSiON'
-pattern: '^(GNOMiSSiON)$'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/GPTHD.yml b/regex_patterns/GPTHD.yml
deleted file mode 100644
index 752527a..0000000
--- a/regex_patterns/GPTHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: GPTHD
-pattern: ^(GPTHD)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/GRiMM.yml b/regex_patterns/GRiMM.yml
index 2fd5af1..7df8ab3 100644
--- a/regex_patterns/GRiMM.yml
+++ b/regex_patterns/GRiMM.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'GRiMM'
-'pattern': '(?<=^|[\s.-])GRiMM\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: GRiMM
+pattern: (?<=^|[\s.-])GRiMM\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/GS.yml b/regex_patterns/GS.yml
deleted file mode 100644
index a45c686..0000000
--- a/regex_patterns/GS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GS'
-pattern: \b(GS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GS88 (1).yml b/regex_patterns/GS88 (1).yml
deleted file mode 100644
index b25c7ca..0000000
--- a/regex_patterns/GS88 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'GS88'
-'pattern': '(?<=^|[\s.-])GS88\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/GS88.yml b/regex_patterns/GS88.yml
index 768757a..7fa3b40 100644
--- a/regex_patterns/GS88.yml
+++ b/regex_patterns/GS88.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])GS88\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/GSK_kun.yml b/regex_patterns/GSK_kun.yml
deleted file mode 100644
index 086ebb4..0000000
--- a/regex_patterns/GSK_kun.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GSK_kun'
-pattern: \b(GSK[._-]kun)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GST.yml b/regex_patterns/GST.yml
deleted file mode 100644
index d7af7af..0000000
--- a/regex_patterns/GST.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GST'
-pattern: \b(GST)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GUHZER (1).yml b/regex_patterns/GUHZER (1).yml
deleted file mode 100644
index db9fbc8..0000000
--- a/regex_patterns/GUHZER (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'GUHZER'
-'pattern': '(?<=^|[\s.-])GUHZER\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/GUHZER.yml b/regex_patterns/GUHZER.yml
index b9a3cd6..c4b29af 100644
--- a/regex_patterns/GUHZER.yml
+++ b/regex_patterns/GUHZER.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])GUHZER\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Galator.yml b/regex_patterns/Galator.yml
deleted file mode 100644
index 1f7f036..0000000
--- a/regex_patterns/Galator.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Galator'
-pattern: \b(Galator)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/GalaxyRG.yml b/regex_patterns/GalaxyRG.yml
deleted file mode 100644
index 777a90f..0000000
--- a/regex_patterns/GalaxyRG.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'GalaxyRG'
-pattern: '\\b(GalaxyRG)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Gao.yml b/regex_patterns/Gao.yml
deleted file mode 100644
index 129f384..0000000
--- a/regex_patterns/Gao.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Gao'
-pattern: \[Gao\]|-Gao\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Geek (1).yml b/regex_patterns/Geek (1).yml
deleted file mode 100644
index 4b4ec28..0000000
--- a/regex_patterns/Geek (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Geek'
-'pattern': '(?<=^|[\s.-])Geek\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Geek.yml b/regex_patterns/Geek.yml
index 80ade46..017e714 100644
--- a/regex_patterns/Geek.yml
+++ b/regex_patterns/Geek.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Geek\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Golumpa.yml b/regex_patterns/Golumpa.yml
deleted file mode 100644
index 0615891..0000000
--- a/regex_patterns/Golumpa.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Golumpa
-pattern: \b(Golumpa)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/HANDJOB (1).yml b/regex_patterns/HANDJOB (1).yml
deleted file mode 100644
index 74a358f..0000000
--- a/regex_patterns/HANDJOB (1).yml	
+++ /dev/null
@@ -1,8 +0,0 @@
-'description': ''
-'name': 'HANDJOB'
-'pattern': '(?<=^|[\s.-])HANDJOB\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-- 'DVD'
-'tests': []
diff --git a/regex_patterns/HANDJOB.yml b/regex_patterns/HANDJOB.yml
index 208963e..81d747d 100644
--- a/regex_patterns/HANDJOB.yml
+++ b/regex_patterns/HANDJOB.yml
@@ -3,4 +3,6 @@ pattern: (?<=^|[\s.-])HANDJOB\b
 description: ''
 tags:
 - Release Group
+- Bluray
+- DVD
 tests: []
diff --git a/regex_patterns/HAV1T.yml b/regex_patterns/HAV1T.yml
deleted file mode 100644
index 96ef245..0000000
--- a/regex_patterns/HAV1T.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HAV1T'
-pattern: \b(HAV1T)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HAiKU.yml b/regex_patterns/HAiKU.yml
deleted file mode 100644
index 95597f8..0000000
--- a/regex_patterns/HAiKU.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HAiKU'
-pattern: \b(HAiKU)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HBO Max (1).yml b/regex_patterns/HBO Max (1).yml
deleted file mode 100644
index 0737d51..0000000
--- a/regex_patterns/HBO Max (1).yml	
+++ /dev/null
@@ -1,74 +0,0 @@
-'description': 'HBO Max is an American subscription video-on-demand streaming service
-  that offers a range of original programming and content from WarnerMedia''s vast
-  library, encompassing brands such as Warner Bros., CNN, Cartoon Network, TBS, and
-  Turner Classic Movies. In mid-to-late 2023, HBO Max underwent a rebranding to "Max".'
-'name': 'HBO Max'
-'pattern': '\b(hmax|hbom|hbo[ ._-]?max)\b(?=[ ._-]web[ ._-]?(dl|rip)\b)'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Many Saints of Newark 2021 1080p HBOMAX WEBRiP x264 WAV-CREATiVE24'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 43
-    'start': 37
-  'matchedContent': 'HBOMAX'
-  'matchedGroups':
-  - 'HBOMAX'
-  - 'RiP'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Looney Tunes Cartoons S04 1080p HBOM WEB-DL DD5.1 H.264-NTb'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 36
-    'start': 32
-  'matchedContent': 'HBOM'
-  'matchedGroups':
-  - 'HBOM'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': '12 oz Mouse S01 1080p HBOMax WEB-DL DDP2 x264-Mr Lahey'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 28
-    'start': 22
-  'matchedContent': 'HBOMax'
-  'matchedGroups':
-  - 'HBOMax'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Silicon Valley S01 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 29
-    'start': 25
-  'matchedContent': 'HMAX'
-  'matchedGroups':
-  - 'HMAX'
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'A Discovery of Witches S03 1080p HBO WEB-DL AAC 2.0 H.264'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'The Yin Yang Master Zero 2024 1080p BluRay REMUX AVC DTS-HD MA 7 1-HBO'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/HBO Max Rename.yml b/regex_patterns/HBO Max Rename.yml
index a54caa6..35b0747 100644
--- a/regex_patterns/HBO Max Rename.yml	
+++ b/regex_patterns/HBO Max Rename.yml	
@@ -1,74 +1,74 @@
-'description': 'HBO Max is an American subscription video-on-demand streaming service
-  that offers a range of original programming and content from WarnerMedia''s vast
+name: HBO Max Rename
+pattern: \[(HMAX)\b|\b(HMAX)\]
+description: HBO Max is an American subscription video-on-demand streaming service
+  that offers a range of original programming and content from WarnerMedia's vast
   library, encompassing brands such as Warner Bros., CNN, Cartoon Network, TBS, and
-  Turner Classic Movies. In mid-to-late 2023, HBO Max underwent a rebranding to "Max".'
-'name': 'HBO Max Rename'
-'pattern': '\[(HMAX)\b|\b(HMAX)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Many Saints of Newark 2021 1080p HBOMAX WEBRiP x264 WAV-CREATiVE24'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 43
-    'start': 37
-  'matchedContent': 'HBOMAX'
-  'matchedGroups':
-  - 'HBOMAX'
-  - 'RiP'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Looney Tunes Cartoons S04 1080p HBOM WEB-DL DD5.1 H.264-NTb'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 36
-    'start': 32
-  'matchedContent': 'HBOM'
-  'matchedGroups':
-  - 'HBOM'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': '12 oz Mouse S01 1080p HBOMax WEB-DL DDP2 x264-Mr Lahey'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 28
-    'start': 22
-  'matchedContent': 'HBOMax'
-  'matchedGroups':
-  - 'HBOMax'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Silicon Valley S01 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan':
-    'end': 29
-    'start': 25
-  'matchedContent': 'HMAX'
-  'matchedGroups':
-  - 'HMAX'
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'A Discovery of Witches S03 1080p HBO WEB-DL AAC 2.0 H.264'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'The Yin Yang Master Zero 2024 1080p BluRay REMUX AVC DTS-HD MA 7 1-HBO'
-  'lastRun': '2024-12-06T04:48:56.790473'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
+  Turner Classic Movies. In mid-to-late 2023, HBO Max underwent a rebranding to "Max".
+tags:
+- Streaming Service
+- WEB-DL
+tests:
+- expected: true
+  id: 1
+  input: The Many Saints of Newark 2021 1080p HBOMAX WEBRiP x264 WAV-CREATiVE24
+  lastRun: '2024-12-06T04:48:56.790473'
+  matchSpan:
+    end: 43
+    start: 37
+  matchedContent: HBOMAX
+  matchedGroups:
+  - HBOMAX
+  - RiP
+  passes: true
+- expected: true
+  id: 2
+  input: Looney Tunes Cartoons S04 1080p HBOM WEB-DL DD5.1 H.264-NTb
+  lastRun: '2024-12-06T04:48:56.790473'
+  matchSpan:
+    end: 36
+    start: 32
+  matchedContent: HBOM
+  matchedGroups:
+  - HBOM
+  - DL
+  passes: true
+- expected: true
+  id: 3
+  input: 12 oz Mouse S01 1080p HBOMax WEB-DL DDP2 x264-Mr Lahey
+  lastRun: '2024-12-06T04:48:56.790473'
+  matchSpan:
+    end: 28
+    start: 22
+  matchedContent: HBOMax
+  matchedGroups:
+  - HBOMax
+  - DL
+  passes: true
+- expected: true
+  id: 4
+  input: Silicon Valley S01 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX
+  lastRun: '2024-12-06T04:48:56.790473'
+  matchSpan:
+    end: 29
+    start: 25
+  matchedContent: HMAX
+  matchedGroups:
+  - HMAX
+  - DL
+  passes: true
+- expected: false
+  id: 5
+  input: A Discovery of Witches S03 1080p HBO WEB-DL AAC 2.0 H.264
+  lastRun: '2024-12-06T04:48:56.790473'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 6
+  input: The Yin Yang Master Zero 2024 1080p BluRay REMUX AVC DTS-HD MA 7 1-HBO
+  lastRun: '2024-12-06T04:48:56.790473'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
diff --git a/regex_patterns/HBO Max.yml b/regex_patterns/HBO Max.yml
index fa44847..eb11739 100644
--- a/regex_patterns/HBO Max.yml	
+++ b/regex_patterns/HBO Max.yml	
@@ -7,7 +7,6 @@ description: HBO Max is an American subscription video-on-demand streaming servi
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/HD77 (1).yml b/regex_patterns/HD77 (1).yml
deleted file mode 100644
index e9ca91a..0000000
--- a/regex_patterns/HD77 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HD77'
-'pattern': '(?<=^|[\s.-])HD77\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HD77.yml b/regex_patterns/HD77.yml
index cc7234a..2040c97 100644
--- a/regex_patterns/HD77.yml
+++ b/regex_patterns/HD77.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HD77\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/HDC.yml b/regex_patterns/HDC.yml
deleted file mode 100644
index cba1ab9..0000000
--- a/regex_patterns/HDC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: HDC
-pattern: (?<=^|[\s.-])HDC\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/HDChina (1).yml b/regex_patterns/HDChina (1).yml
deleted file mode 100644
index 5aee315..0000000
--- a/regex_patterns/HDChina (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HDChina'
-'pattern': '(?<=^|[\s.-])HDChina\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HDChina.yml b/regex_patterns/HDChina.yml
index 15d2f31..41751b8 100644
--- a/regex_patterns/HDChina.yml
+++ b/regex_patterns/HDChina.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HDChina\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/HDH.yml b/regex_patterns/HDH.yml
deleted file mode 100644
index 4ffdff1..0000000
--- a/regex_patterns/HDH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: HDH
-pattern: (?<=^|[\s.-])HDH\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/HDMaNiAcS (1).yml b/regex_patterns/HDMaNiAcS (1).yml
deleted file mode 100644
index 6727a60..0000000
--- a/regex_patterns/HDMaNiAcS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HDMaNiAcS'
-'pattern': '(?<=^|[\s.-])HDMaNiAcS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HDMaNiAcS.yml b/regex_patterns/HDMaNiAcS.yml
index 3c6d8b5..1d89129 100644
--- a/regex_patterns/HDMaNiAcS.yml
+++ b/regex_patterns/HDMaNiAcS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HDMaNiAcS\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/HDR (1).yml b/regex_patterns/HDR (1).yml
deleted file mode 100644
index d6df3e1..0000000
--- a/regex_patterns/HDR (1).yml	
+++ /dev/null
@@ -1,95 +0,0 @@
-'description': 'This regex matches a `HDR` generalisation. This can be HDR10, HDR10+,
-  etc. '
-'name': 'HDR'
-'pattern': '\b(HDR)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': true
-  'id': 2
-  'input': 'HDR+'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan':
-    'end': 3
-    'start': 0
-  'matchedContent': 'HDR'
-  'matchedGroups':
-  - 'HDR'
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'HDR10'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'HDR10+'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 8
-  'input': 'HDR10'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'Barbie (2023) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR TrueHD Atmos 7.1
-    English-FraMeSToR'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan':
-    'end': 55
-    'start': 52
-  'matchedContent': 'HDR'
-  'matchedGroups':
-  - 'HDR'
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Game of Thrones (2011) S06 2160p UHD BluRay REMUX HEVC DV HDR TrueHD Atmos
-    7.1 English-FraMeSToR'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan':
-    'end': 61
-    'start': 58
-  'matchedContent': 'HDR'
-  'matchedGroups':
-  - 'HDR'
-  'passes': true
-- 'expected': false
-  'id': 11
-  'input': 'Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray
-    DoVi HDR10 HEVC TrueHD 7.1 Atmos-ANKO'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 12
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 13
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10P
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-04-03T04:14:14.836165'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/HDR10 (1).yml b/regex_patterns/HDR10 (1).yml
deleted file mode 100644
index 8436052..0000000
--- a/regex_patterns/HDR10 (1).yml	
+++ /dev/null
@@ -1,116 +0,0 @@
-'description': 'This regex matches `HDR10` only when it *is not* followed by any HDR
-  format specifiers like `+`, or `Plus`. '
-'name': 'HDR10'
-'pattern': '\bHDR10(?!\+|Plus)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': false
-  'id': 2
-  'input': 'HDR+'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'HDR10'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan':
-    'end': 5
-    'start': 0
-  'matchedContent': 'HDR10'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'HDR10+'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'HLG HDR'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'SDR HDR'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'PQ HDR'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'HDR10'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan':
-    'end': 5
-    'start': 0
-  'matchedContent': 'HDR10'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 9
-  'input': 'Barbie (2023) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR TrueHD Atmos 7.1
-    English-FraMeSToR'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 10
-  'input': 'Game of Thrones (2011) S06 2160p UHD BluRay REMUX HEVC DV HDR TrueHD Atmos
-    7.1 English-FraMeSToR'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 11
-  'input': 'Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray
-    DoVi HDR10 HEVC TrueHD 7.1 Atmos-ANKO'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan':
-    'end': 82
-    'start': 77
-  'matchedContent': 'HDR10'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 12
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 13
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10P
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-04-02T20:01:38.732592'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/HDR10 (Missing Groups) (1).yml b/regex_patterns/HDR10 (Missing Groups) (1).yml
deleted file mode 100644
index dacc1fa..0000000
--- a/regex_patterns/HDR10 (Missing Groups) (1).yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-'description': 'Matches groups who mislabel HDR10'
-'name': 'HDR10 (Missing Groups)'
-'pattern': '\b(3L|CiNEPHiLES|c0kE|EDV|ElNeekster|FraMeSToR|HDH|HQMUX|Kenobi|mimic|NTb|playBD|RYU|SiCFoI|STRiKES|TekMUX|TRiToN|W4NK3R)\b'
-'tags':
-- 'Release Group'
-- 'HDR'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Loki S01 2023 2160p UHD Blu-ray Remux HEVC TrueHD 7 1 Atmos-HDS'
-  'lastRun': '2025-01-12T01:22:17.490763'
-  'matchSpan':
-    'end': 63
-    'start': 60
-  'matchedContent': 'HDS'
-  'matchedGroups':
-  - 'HDS'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': "\t Loki S01 REPACK UHD BluRay 2160p TrueHD Atmos 7.1 DV HEVC HYBRID REMUX-FraMeSToR"
-  'lastRun': '2025-01-12T01:22:17.490763'
-  'matchSpan':
-    'end': 82
-    'start': 73
-  'matchedContent': 'FraMeSToR'
-  'matchedGroups':
-  - 'FraMeSToR'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Alien Romulus 2024 BluRay 2160p UHD REMUX HEVC (10bit) DV Atmos DTS-HD
-    MA 7 1-Aisha@RFX'
-  'lastRun': '2025-01-12T01:22:17.490763'
-  'matchSpan':
-    'end': 87
-    'start': 78
-  'matchedContent': 'Aisha@RFX'
-  'matchedGroups':
-  - 'Aisha@RFX'
-  - '@RFX'
-  'passes': true
diff --git a/regex_patterns/HDR10 (Missing Groups).yml b/regex_patterns/HDR10 (Missing Groups).yml
index 5e5b381..3806ff3 100644
--- a/regex_patterns/HDR10 (Missing Groups).yml	
+++ b/regex_patterns/HDR10 (Missing Groups).yml	
@@ -1,5 +1,5 @@
 name: HDR10 (Missing Groups)
-pattern: \b(FraMeSToR|HQMUX|SiCFoI|playBD|RYU|ElNeekster|CiNEPHiLES|3L|EDV|Kenobi|TRiToN|HDH|NTb|Flights|TekMUX|HDS|Aisha(@RFX)?|STRiKES|c0kE|mimic)\b
+pattern: \b(3L|CiNEPHiLES|c0kE|EDV|ElNeekster|FraMeSToR|HDH|HQMUX|Kenobi|mimic|NTb|playBD|RYU|SiCFoI|STRiKES|TekMUX|TRiToN|W4NK3R)\b
 description: Matches groups who mislabel HDR10
 tags:
 - Release Group
diff --git a/regex_patterns/HDR10+ (1).yml b/regex_patterns/HDR10+ (1).yml
deleted file mode 100644
index 85d1daa..0000000
--- a/regex_patterns/HDR10+ (1).yml	
+++ /dev/null
@@ -1,154 +0,0 @@
-'description': 'This regex matches `HDR10` when followed by either a plus sign `+`,
-  `P`, or `Plus`'
-'name': 'HDR10+'
-'pattern': '\bHDR10.?(\+|P(lus)?\b)'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'HDR'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'HDR+'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'HDR10'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'HDR10+'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 6
-    'start': 0
-  'matchedContent': 'HDR10+'
-  'matchedGroups':
-  - '+'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'HLG HDR'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'SDR HDR'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'PQ HDR'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'HDR10P'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 6
-    'start': 0
-  'matchedContent': 'HDR10P'
-  'matchedGroups':
-  - 'P'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'HDR10Plus'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 9
-    'start': 0
-  'matchedContent': 'HDR10Plus'
-  'matchedGroups':
-  - 'Plus'
-  - 'lus'
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 68
-    'start': 62
-  'matchedContent': 'HDR10+'
-  'matchedGroups':
-  - '+'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 11
-  'input': 'La Maison S01 REPACK 2160p ATVP WEB-DL Dual-Audio DD+ 5.1 Atmos DV HDR10+
-    H.265-Kitsune'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 73
-    'start': 67
-  'matchedContent': 'HDR10+'
-  'matchedGroups':
-  - '+'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 12
-  'input': 'Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray
-    DoVi HDR10 HEVC TrueHD 7.1 Atmos-ANKO'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 13
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10 Plus
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 72
-    'start': 62
-  'matchedContent': 'HDR10 Plus'
-  'matchedGroups':
-  - 'Plus'
-  - 'lus'
-  'passes': true
-- 'expected': true
-  'id': 14
-  'input': 'Killers of the Flower Moon (2023) {tmdb-466420} [iT][WEBDL-2160p][DV HDR10Plus][EAC3
-    Atmos 5.1][h265]-FLUX.mkv'
-  'lastRun': '2025-06-18T11:53:45.281996'
-  'matchSpan':
-    'end': 78
-    'start': 69
-  'matchedContent': 'HDR10Plus'
-  'matchedGroups':
-  - 'Plus'
-  - 'lus'
-  'passes': true
diff --git a/regex_patterns/HDR10+.yml b/regex_patterns/HDR10+.yml
index dc8e75a..86de42c 100644
--- a/regex_patterns/HDR10+.yml
+++ b/regex_patterns/HDR10+.yml
@@ -10,7 +10,7 @@ tests:
 - expected: false
   id: 1
   input: HDR
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -18,7 +18,7 @@ tests:
 - expected: false
   id: 2
   input: HDR+
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -26,7 +26,7 @@ tests:
 - expected: false
   id: 3
   input: HDR10
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -34,7 +34,7 @@ tests:
 - expected: true
   id: 4
   input: HDR10+
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan:
     end: 6
     start: 0
@@ -46,7 +46,7 @@ tests:
 - expected: false
   id: 5
   input: HLG HDR
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -54,7 +54,7 @@ tests:
 - expected: false
   id: 6
   input: SDR HDR
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -62,7 +62,7 @@ tests:
 - expected: false
   id: 7
   input: PQ HDR
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -70,7 +70,7 @@ tests:
 - expected: true
   id: 8
   input: HDR10P
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan:
     end: 6
     start: 0
@@ -82,7 +82,7 @@ tests:
 - expected: true
   id: 9
   input: HDR10Plus
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan:
     end: 9
     start: 0
@@ -95,7 +95,7 @@ tests:
   id: 10
   input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+ TrueHD
     Atmos 7.1 English-WiLDCAT
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan:
     end: 68
     start: 62
@@ -108,7 +108,7 @@ tests:
   id: 11
   input: La Maison S01 REPACK 2160p ATVP WEB-DL Dual-Audio DD+ 5.1 Atmos DV HDR10+
     H.265-Kitsune
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan:
     end: 73
     start: 67
@@ -121,7 +121,7 @@ tests:
   id: 12
   input: Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray DoVi
     HDR10 HEVC TrueHD 7.1 Atmos-ANKO
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -130,7 +130,7 @@ tests:
   id: 13
   input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10 Plus
     TrueHD Atmos 7.1 English-WiLDCAT
-  lastRun: '2025-04-05T09:25:21.372205'
+  lastRun: '2025-06-18T11:53:45.281996'
   matchSpan:
     end: 72
     start: 62
@@ -139,3 +139,16 @@ tests:
   - Plus
   - lus
   passes: true
+- expected: true
+  id: 14
+  input: Killers of the Flower Moon (2023) {tmdb-466420} [iT][WEBDL-2160p][DV HDR10Plus][EAC3
+    Atmos 5.1][h265]-FLUX.mkv
+  lastRun: '2025-06-18T11:53:45.281996'
+  matchSpan:
+    end: 78
+    start: 69
+  matchedContent: HDR10Plus
+  matchedGroups:
+  - Plus
+  - lus
+  passes: true
diff --git a/regex_patterns/HDS (1).yml b/regex_patterns/HDS (1).yml
deleted file mode 100644
index fbe7790..0000000
--- a/regex_patterns/HDS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HDS'
-'pattern': '(?<=^|[\s.-])HDS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HDS.yml b/regex_patterns/HDS.yml
index 7e1eb8d..b8ef460 100644
--- a/regex_patterns/HDS.yml
+++ b/regex_patterns/HDS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HDS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/HDT.yml b/regex_patterns/HDT.yml
deleted file mode 100644
index 7566fab..0000000
--- a/regex_patterns/HDT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: HDT
-pattern: ^(HDT)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/HDTime.yml b/regex_patterns/HDTime.yml
deleted file mode 100644
index 3a14f02..0000000
--- a/regex_patterns/HDTime.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: HDTime
-pattern: ^(HDTime)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/HDWinG.yml b/regex_patterns/HDWinG.yml
deleted file mode 100644
index 3d7354c..0000000
--- a/regex_patterns/HDWinG.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: HDWinG
-pattern: ^(HDWinG)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/HDmux (1).yml b/regex_patterns/HDmux (1).yml
deleted file mode 100644
index 7e06d09..0000000
--- a/regex_patterns/HDmux (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HDmux'
-'pattern': '(?<=^|[\s.-])HDmux\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HDmux.yml b/regex_patterns/HDmux.yml
index 4cff57b..516b984 100644
--- a/regex_patterns/HDmux.yml
+++ b/regex_patterns/HDmux.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HDmux\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/HENiL.yml b/regex_patterns/HENiL.yml
deleted file mode 100644
index 8fe1fa8..0000000
--- a/regex_patterns/HENiL.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HENiL'
-pattern: \b(HENiL)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HEVC.yml b/regex_patterns/HEVC.yml
index 26b8bc6..847e70b 100644
--- a/regex_patterns/HEVC.yml
+++ b/regex_patterns/HEVC.yml
@@ -1,46 +1,46 @@
-'description': 'An open source encoder that produces HEVC videos. '
-'name': 'HEVC'
-'pattern': '\b(HEVC)\b'
-'tags':
-- 'Encoder'
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0 English
-    - r00t QxR)'
-  'lastRun': '2025-01-14T10:24:52.457470'
-  'matchSpan':
-    'end': 83
-    'start': 0
-  'matchedContent': 'Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0
-    English - r00t QxR)'
-  'matchedGroups':
-  - 'x265'
+name: HEVC
+pattern: \b(HEVC)\b
+description: 'An open source encoder that produces HEVC videos. '
+tags:
+- Encoder
+- Codec
+tests:
+- expected: true
+  id: 1
+  input: Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0 English -
+    r00t QxR)
+  lastRun: '2025-01-14T10:24:52.457470'
+  matchSpan:
+    end: 83
+    start: 0
+  matchedContent: Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0
+    English - r00t QxR)
+  matchedGroups:
+  - x265
   - '265'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio'
-  'lastRun': '2025-01-14T10:24:52.457470'
-  'matchSpan':
-    'end': 68
-    'start': 0
-  'matchedContent': 'Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio'
-  'matchedGroups':
-  - 'x265'
+  passes: true
+- expected: true
+  id: 2
+  input: Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio
+  lastRun: '2025-01-14T10:24:52.457470'
+  matchSpan:
+    end: 68
+    start: 0
+  matchedContent: Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio
+  matchedGroups:
+  - x265
   - '265'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Spider-Man Across the Spider-Verse 2023 1080p UHD BluRay DDP7 1 DoVi HDR10x265-c0kE'
-  'lastRun': '2025-01-14T10:24:52.457470'
-  'matchSpan':
-    'end': 83
-    'start': 0
-  'matchedContent': 'Spider-Man Across the Spider-Verse 2023 1080p UHD BluRay DDP7
-    1 DoVi HDR10x265-c0kE'
-  'matchedGroups':
-  - 'x265'
+  passes: true
+- expected: true
+  id: 3
+  input: Spider-Man Across the Spider-Verse 2023 1080p UHD BluRay DDP7 1 DoVi HDR10x265-c0kE
+  lastRun: '2025-01-14T10:24:52.457470'
+  matchSpan:
+    end: 83
+    start: 0
+  matchedContent: Spider-Man Across the Spider-Verse 2023 1080p UHD BluRay DDP7 1
+    DoVi HDR10x265-c0kE
+  matchedGroups:
+  - x265
   - '265'
-  'passes': true
+  passes: true
diff --git a/regex_patterns/HHWEB (1).yml b/regex_patterns/HHWEB (1).yml
deleted file mode 100644
index af50856..0000000
--- a/regex_patterns/HHWEB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HHWEB'
-'pattern': '(?<=^|[\s.-])HHWEB\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/HHWEB.yml b/regex_patterns/HHWEB.yml
index d134c47..2b0dbfb 100644
--- a/regex_patterns/HHWEB.yml
+++ b/regex_patterns/HHWEB.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HHWEB\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/HLG (1).yml b/regex_patterns/HLG (1).yml
deleted file mode 100644
index 6fe68e4..0000000
--- a/regex_patterns/HLG (1).yml	
+++ /dev/null
@@ -1,8 +0,0 @@
-'description': 'This regex matches a `HLG` generalisation. This is a basic HDR Format.'
-'name': 'HLG'
-'pattern': '\b(HLG)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests': []
diff --git a/regex_patterns/HLG.yml b/regex_patterns/HLG.yml
index 66db6de..c929ea0 100644
--- a/regex_patterns/HLG.yml
+++ b/regex_patterns/HLG.yml
@@ -1,5 +1,8 @@
 name: HLG
 pattern: \b(HLG)\b
-description: ''
-tags: []
+description: This regex matches a `HLG` generalisation. This is a basic HDR Format.
+tags:
+- Enhancement
+- Colour Grade
+- HDR
 tests: []
diff --git a/regex_patterns/HOA.yml b/regex_patterns/HOA.yml
deleted file mode 100644
index 1788ef6..0000000
--- a/regex_patterns/HOA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: HOA
-pattern: (?<=^|[\s.-])HOA\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/HONE (1).yml b/regex_patterns/HONE (1).yml
deleted file mode 100644
index c190e15..0000000
--- a/regex_patterns/HONE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HONE'
-'pattern': '(?<=^|[\s.-])HONE\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/HONE.yml b/regex_patterns/HONE.yml
index 839c742..24537f3 100644
--- a/regex_patterns/HONE.yml
+++ b/regex_patterns/HONE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HONE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- WEB-DL
+tests: []
diff --git a/regex_patterns/HQMUX (1).yml b/regex_patterns/HQMUX (1).yml
deleted file mode 100644
index c501178..0000000
--- a/regex_patterns/HQMUX (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HQMUX'
-'pattern': '(?<=^|[\s.-])HQMUX\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HQMUX.yml b/regex_patterns/HQMUX.yml
index 22ad9d9..a43a1d0 100644
--- a/regex_patterns/HQMUX.yml
+++ b/regex_patterns/HQMUX.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HQMUX\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/HR.yml b/regex_patterns/HR.yml
deleted file mode 100644
index 82d01b9..0000000
--- a/regex_patterns/HR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HR'
-pattern: \b(HR)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HUNTJR (1).yml b/regex_patterns/HUNTJR (1).yml
deleted file mode 100644
index 7d86224..0000000
--- a/regex_patterns/HUNTJR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HUNTJR'
-'pattern': '(?<=^|[\s.-])HUNTJR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HUNTJR.yml b/regex_patterns/HUNTJR.yml
index 711c087..fbbb283 100644
--- a/regex_patterns/HUNTJR.yml
+++ b/regex_patterns/HUNTJR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HUNTJR\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/HaiveMind.yml b/regex_patterns/HaiveMind.yml
deleted file mode 100644
index 7350a52..0000000
--- a/regex_patterns/HaiveMind.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HaiveMind'
-pattern: \b(HaiveMind)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Hakata-Ramen.yml b/regex_patterns/Hakata-Ramen.yml
deleted file mode 100644
index 1acfe9c..0000000
--- a/regex_patterns/Hakata-Ramen.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Hakata Ramen'
-pattern: \b(Hakata[ .-]?Ramen)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Hall_of_C.yml b/regex_patterns/Hall_of_C.yml
deleted file mode 100644
index 9f92ff9..0000000
--- a/regex_patterns/Hall_of_C.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Hall_of_C'
-pattern: \b(Hall_of_C)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Hares (1).yml b/regex_patterns/Hares (1).yml
deleted file mode 100644
index 983e907..0000000
--- a/regex_patterns/Hares (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Hares'
-'pattern': '(?<=^|[\s.-])Hares\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Hares.yml b/regex_patterns/Hares.yml
index 4f2e80a..573fe4d 100644
--- a/regex_patterns/Hares.yml
+++ b/regex_patterns/Hares.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Hares\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Hark0N.yml b/regex_patterns/Hark0N.yml
deleted file mode 100644
index 25a8c0a..0000000
--- a/regex_patterns/Hark0N.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Hark0N'
-pattern: \b(Hark0N)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Harunatsu.yml b/regex_patterns/Harunatsu.yml
deleted file mode 100644
index 1be6ebf..0000000
--- a/regex_patterns/Harunatsu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Harunatsu'
-pattern: \[Harunatsu\]|-Harunatsu\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HatSubs.yml b/regex_patterns/HatSubs.yml
deleted file mode 100644
index deda5c1..0000000
--- a/regex_patterns/HatSubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HatSubs'
-pattern: \b(HatSubs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Hatsuyuki.yml b/regex_patterns/Hatsuyuki.yml
deleted file mode 100644
index 25511b6..0000000
--- a/regex_patterns/Hatsuyuki.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Hatsuyuki'
-pattern: \[Hatsuyuki\]|-Hatsuyuki\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HiDt (1).yml b/regex_patterns/HiDt (1).yml
deleted file mode 100644
index 9be87a6..0000000
--- a/regex_patterns/HiDt (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HiDt'
-'pattern': '(?<=^|[\s.-])HiDt\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HiDt.yml b/regex_patterns/HiDt.yml
index 00af836..5b42849 100644
--- a/regex_patterns/HiDt.yml
+++ b/regex_patterns/HiDt.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HiDt\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/HiFi (1).yml b/regex_patterns/HiFi (1).yml
deleted file mode 100644
index 8a46ca3..0000000
--- a/regex_patterns/HiFi (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HiFi'
-'pattern': '(?<=^|[\s.-])HiFi\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HiFi.yml b/regex_patterns/HiFi.yml
index e6ae475..3bd9ab7 100644
--- a/regex_patterns/HiFi.yml
+++ b/regex_patterns/HiFi.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HiFi\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/HiP (1).yml b/regex_patterns/HiP (1).yml
deleted file mode 100644
index 4ce3360..0000000
--- a/regex_patterns/HiP (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HiP'
-'pattern': '(?<=^|[\s.-])HiP\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HiP.yml b/regex_patterns/HiP.yml
index 2cc824e..6cb1ba8 100644
--- a/regex_patterns/HiP.yml
+++ b/regex_patterns/HiP.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HiP\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/HiSD.yml b/regex_patterns/HiSD.yml
deleted file mode 100644
index 4909827..0000000
--- a/regex_patterns/HiSD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HiSD'
-pattern: '^(HiSD)$'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Hitoku.yml b/regex_patterns/Hitoku.yml
deleted file mode 100644
index a6fc3fb..0000000
--- a/regex_patterns/Hitoku.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Hitoku'
-pattern: \[Hitoku\]|-Hitoki\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HollowRoxas.yml b/regex_patterns/HollowRoxas.yml
deleted file mode 100644
index 3e7dfbd..0000000
--- a/regex_patterns/HollowRoxas.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HollowRoxas'
-pattern: \b(HollowRoxas)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Holomux.yml b/regex_patterns/Holomux.yml
deleted file mode 100644
index 5a55764..0000000
--- a/regex_patterns/Holomux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Holomux'
-pattern: \b(Holomux)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HorribleRips.yml b/regex_patterns/HorribleRips.yml
deleted file mode 100644
index eee8c47..0000000
--- a/regex_patterns/HorribleRips.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'HorribleRips'
-pattern: \b(HorribleRips)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/HorribleSubs (1).yml b/regex_patterns/HorribleSubs (1).yml
deleted file mode 100644
index 5924fa6..0000000
--- a/regex_patterns/HorribleSubs (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HorribleSubs'
-'pattern': '(?<=^|[\s.-])HorribleSubs\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/HorribleSubs.yml b/regex_patterns/HorribleSubs.yml
index b892524..b4bf5a8 100644
--- a/regex_patterns/HorribleSubs.yml
+++ b/regex_patterns/HorribleSubs.yml
@@ -1,6 +1,7 @@
-name: 'HorribleSubs'
-pattern: \b(HorribleSubs)\b
+name: HorribleSubs
+pattern: (?<=^|[\s.-])HorribleSubs\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Hotstar.yml b/regex_patterns/Hotstar.yml
index 64dd187..d5c8606 100644
--- a/regex_patterns/Hotstar.yml
+++ b/regex_patterns/Hotstar.yml
@@ -1,12 +1,12 @@
-'description': 'Disney+ Hotstar, also known as JioHotstar or simply Hotstar, is an
-  Indian subscription video-on-demand over-the-top streaming service owned by Disney
-  Star. The brand was introduced as Hotstar for a streaming service carrying content
-  from Disney Star''s (formerly Star India) local networks, including films, television
+name: Hotstar
+pattern: \b(HTSR)\b
+description: Disney+ Hotstar, also known as JioHotstar or simply Hotstar, is an Indian
+  subscription video-on-demand over-the-top streaming service owned by Disney Star.
+  The brand was introduced as Hotstar for a streaming service carrying content from
+  Disney Star's (formerly Star India) local networks, including films, television
   series, live sports, and original programming, as well as featuring content licensed
-  from third parties such as Showtime among others.'
-'name': 'Hotstar'
-'pattern': '\b(HTSR)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+  from third parties such as Showtime among others.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Hulu (1).yml b/regex_patterns/Hulu (1).yml
deleted file mode 100644
index 112b4d7..0000000
--- a/regex_patterns/Hulu (1).yml	
+++ /dev/null
@@ -1,32 +0,0 @@
-'description': 'Hulu, an American subscription streaming service owned by Disney,
-  offers recent TV episodes, full seasons of shows, original content, and live TV
-  channels. As of December 2023, Hulu content is being integrated into Disney+, making
-  its library accessible to Disney+ subscribers.'
-'name': 'Hulu'
-'pattern': '\b(Hulu)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Agent Recon 2024 1080p HULU WEB-DL DDP 5 1 H 264-PiRaTeS'
-  'lastRun': '2024-12-06T05:28:53.151608'
-  'matchSpan':
-    'end': 27
-    'start': 23
-  'matchedContent': 'HULU'
-  'matchedGroups':
-  - 'HULU'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Gullivers Travels 2010 1080p HULU WEB-DL DDP 5 1 H 264-PiRaTeS'
-  'lastRun': '2024-12-06T05:28:53.151608'
-  'matchSpan':
-    'end': 33
-    'start': 29
-  'matchedContent': 'HULU'
-  'matchedGroups':
-  - 'HULU'
-  'passes': true
diff --git a/regex_patterns/Hulu.yml b/regex_patterns/Hulu.yml
index 3d7dc07..3a998ac 100644
--- a/regex_patterns/Hulu.yml
+++ b/regex_patterns/Hulu.yml
@@ -1,5 +1,5 @@
 name: Hulu
-pattern: \b(hulu)\b
+pattern: \b(Hulu)\b
 description: Hulu, an American subscription streaming service owned by Disney, offers
   recent TV episodes, full seasons of shows, original content, and live TV channels.
   As of December 2023, Hulu content is being integrated into Disney+, making its library
@@ -7,7 +7,6 @@ description: Hulu, an American subscription streaming service owned by Disney, o
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/HypStu (1).yml b/regex_patterns/HypStu (1).yml
deleted file mode 100644
index 9c43ff1..0000000
--- a/regex_patterns/HypStu (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'HypStu'
-'pattern': '(?<=^|[\s.-])HypStu\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/HypStu.yml b/regex_patterns/HypStu.yml
index 881f89a..6aec614 100644
--- a/regex_patterns/HypStu.yml
+++ b/regex_patterns/HypStu.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])HypStu\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/IAMABLE (1).yml b/regex_patterns/IAMABLE (1).yml
deleted file mode 100644
index 65ebe90..0000000
--- a/regex_patterns/IAMABLE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'IAMABLE'
-'pattern': '(?<=^|[\s.-])IAMABLE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/IAMABLE.yml b/regex_patterns/IAMABLE.yml
index 03acfb0..a29a216 100644
--- a/regex_patterns/IAMABLE.yml
+++ b/regex_patterns/IAMABLE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])IAMABLE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/ICEBLUE.yml b/regex_patterns/ICEBLUE.yml
deleted file mode 100644
index 45b24e0..0000000
--- a/regex_patterns/ICEBLUE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ICEBLUE'
-pattern: \b(ICEBLUE)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/IDE (1).yml b/regex_patterns/IDE (1).yml
deleted file mode 100644
index 46eb5cf..0000000
--- a/regex_patterns/IDE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'IDE'
-'pattern': '(?<=^|[\s.-])IDE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/IDE.yml b/regex_patterns/IDE.yml
index 2b0b147..e949037 100644
--- a/regex_patterns/IDE.yml
+++ b/regex_patterns/IDE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])IDE\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/IK (1).yml b/regex_patterns/IK (1).yml
deleted file mode 100644
index 2307dd1..0000000
--- a/regex_patterns/IK (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'IK'
-'pattern': '(?<=^|[\s.-])IK\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/IK.yml b/regex_patterns/IK.yml
index 52cd103..207c967 100644
--- a/regex_patterns/IK.yml
+++ b/regex_patterns/IK.yml
@@ -1,6 +1,7 @@
-name: 'IK'
-pattern: \b(IK)\b
+name: IK
+pattern: (?<=^|[\s.-])IK\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/IMAX (1).yml b/regex_patterns/IMAX (1).yml
deleted file mode 100644
index 18afd0f..0000000
--- a/regex_patterns/IMAX (1).yml	
+++ /dev/null
@@ -1,42 +0,0 @@
-'description': 'Matches any IMAX release. This includes:
-
-  - Any movie shot with IMAX in mind and henceforth tagged as `IMAX`
-
-  - IMAX Enchanced digital releases found on `Disney + / Bravia Core`'
-'name': 'IMAX'
-'pattern': '\b((?<!NON.?)IMAX)\b'
-'tags':
-- 'Enhancement'
-- 'Aspect Ratio'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'A.Writers.Odyssey.2021.1080p.IMAX.BluRay.REMUX.AVC.TrueHD.7.1.Atmos-BELGiAN.mkv'
-  'lastRun': '2025-02-25T22:05:56.005325'
-  'matchSpan':
-    'end': 33
-    'start': 29
-  'matchedContent': 'IMAX'
-  'matchedGroups':
-  - 'IMAX'
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Transformers Age Of Extinction 2014 NON-IMAX BluRay 1080p DTS AC3 x264-MgB'
-  'lastRun': '2025-02-25T22:05:56.005325'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Thor Ragnarok 2017 IMAX Enhanced 1080p HFR WEB-DL HDR10 HEVC 10bit DDP
-    5 1-Robo29'
-  'lastRun': '2025-02-25T22:05:56.005325'
-  'matchSpan':
-    'end': 23
-    'start': 19
-  'matchedContent': 'IMAX'
-  'matchedGroups':
-  - 'IMAX'
-  'passes': true
diff --git a/regex_patterns/IMAX Enhanced (1).yml b/regex_patterns/IMAX Enhanced (1).yml
deleted file mode 100644
index bc66b86..0000000
--- a/regex_patterns/IMAX Enhanced (1).yml	
+++ /dev/null
@@ -1,86 +0,0 @@
-'description': 'Matches IMAX releases from specific digital sources.
-
-
-  - Checks for WEBs from `Disney+` or `Bravia Core`
-
-  - Ensures "IMAX" appears (with optional "Enhanced" suffix) but not when preceded
-  by "NON"'
-'name': 'IMAX Enhanced'
-'pattern': '^(?=.*\b((DSNP|Disney\+|BC|B?CORE)(?=.?web.?(dl|rip)\b)))(?=.*\b((?<!NON.?)IMAX(.?Enhanced)?)\b)'
-'tags':
-- 'Enhancement'
-- 'Aspect Ratio'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'A.Writers.Odyssey.2021.1080p.IMAX.BluRay.REMUX.AVC.TrueHD.7.1.Atmos-BELGiAN.mkv'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Transformers Age Of Extinction 2014 NON-IMAX BluRay 1080p DTS AC3 x264-MgB'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Thor Ragnarok 2017 IMAX Enhanced 1080p HFR WEB-DL HDR10 HEVC 10bit DDP
-    5 1-Robo29'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Oppenheimer (2023) 2160p (UHD BluRay Enhanced IMAX HDR10Plus DoVi HEVC
-    10Bit TrueHD 5 1Ch and DTS-HD MA 5 1Ch)-ShieldBearer'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Thor Ragnarok 2017 IMAX Enhanced 1080p DSNP WEB-DL HDR10 HEVC 10bit DDP
-    5 1-Robo29'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan':
-    'end': 0
-    'start': 0
-  'matchedContent': ''
-  'matchedGroups':
-  - 'DSNP'
-  - 'DSNP'
-  - 'DL'
-  - 'IMAX Enhanced'
-  - ' Enhanced'
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'Thor Ragnarok 2017 IMAX 1080p DSNP WEB-DL HDR10 HEVC 10bit DDP 5 1-Robo29'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan':
-    'end': 0
-    'start': 0
-  'matchedContent': ''
-  'matchedGroups':
-  - 'DSNP'
-  - 'DSNP'
-  - 'DL'
-  - 'IMAX'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'Thor Ragnarok 2017 IMAX Enhanced 1080p WEB-DL HDR10 HEVC 10bit DDP 5 1-Robo29'
-  'lastRun': '2025-02-25T22:06:39.145915'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Impatience.yml b/regex_patterns/Impatience.yml
deleted file mode 100644
index 6dfea75..0000000
--- a/regex_patterns/Impatience.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Impatience'
-pattern: \[Impatience\]|-Impatience\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Inka-Subs.yml b/regex_patterns/Inka-Subs.yml
deleted file mode 100644
index 43e997f..0000000
--- a/regex_patterns/Inka-Subs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Inka-Subs'
-pattern: \b(Inka-Subs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/IrizaRaws.yml b/regex_patterns/IrizaRaws.yml
deleted file mode 100644
index 24eda7e..0000000
--- a/regex_patterns/IrizaRaws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'IrizaRaws'
-pattern: Iriza[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Iznjie Biznjie.yml b/regex_patterns/Iznjie Biznjie.yml
index 8f7bd3f..a951806 100644
--- a/regex_patterns/Iznjie Biznjie.yml	
+++ b/regex_patterns/Iznjie Biznjie.yml	
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'Iznjie Biznjie'
-'pattern': '(?<=^|[\s.-])Iznjie Biznjie\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
+name: Iznjie Biznjie
+pattern: (?<=^|[\s.-])Iznjie Biznjie\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/Iznjie_Biznjie.yml b/regex_patterns/Iznjie_Biznjie.yml
deleted file mode 100644
index 174078d..0000000
--- a/regex_patterns/Iznjie_Biznjie.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Iznjie Biznjie'
-pattern: \b(Iznjie[ .-]Biznjie)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/JETIX.yml b/regex_patterns/JETIX.yml
deleted file mode 100644
index 8bf9166..0000000
--- a/regex_patterns/JETIX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: JETIX
-pattern: ^(JETIX)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/JFF.yml b/regex_patterns/JFF.yml
deleted file mode 100644
index 0da1935..0000000
--- a/regex_patterns/JFF.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: JFF
-pattern: ^(JFF)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/JacobSwaggedUp.yml b/regex_patterns/JacobSwaggedUp.yml
deleted file mode 100644
index a56c7ca..0000000
--- a/regex_patterns/JacobSwaggedUp.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'JacobSwaggedUp'
-pattern: \b(JacobSwaggedUp)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Johnny-englishsubs.yml b/regex_patterns/Johnny-englishsubs.yml
deleted file mode 100644
index 6f74a90..0000000
--- a/regex_patterns/Johnny-englishsubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Johnny-englishsubs'
-pattern: \b(Johnny-englishsubs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Judgement.yml b/regex_patterns/Judgement.yml
deleted file mode 100644
index bba1435..0000000
--- a/regex_patterns/Judgement.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Judgement'
-pattern: \[Judgment\]|-Judgment\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/JustWatch (1).yml b/regex_patterns/JustWatch (1).yml
deleted file mode 100644
index 2443dc6..0000000
--- a/regex_patterns/JustWatch (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'JustWatch'
-'pattern': '(?<=^|[\s.-])JustWatch\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/JustWatch.yml b/regex_patterns/JustWatch.yml
index f4eb90c..e792d45 100644
--- a/regex_patterns/JustWatch.yml
+++ b/regex_patterns/JustWatch.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])JustWatch\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/JySzE.yml b/regex_patterns/JySzE.yml
deleted file mode 100644
index 258694e..0000000
--- a/regex_patterns/JySzE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: JySzE
-pattern: \b(JySzE)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KAN3D2M (1).yml b/regex_patterns/KAN3D2M (1).yml
deleted file mode 100644
index cbaa067..0000000
--- a/regex_patterns/KAN3D2M (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'KAN3D2M'
-'pattern': '(?<=^|[\s.-])KAN3D2M\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/KAN3D2M.yml b/regex_patterns/KAN3D2M.yml
index 92a3cb2..3ff10b7 100644
--- a/regex_patterns/KAN3D2M.yml
+++ b/regex_patterns/KAN3D2M.yml
@@ -1,6 +1,7 @@
-name: 'KAN3D2M'
-pattern: \b(KAN3D2M)\b
+name: KAN3D2M
+pattern: (?<=^|[\s.-])KAN3D2M\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/KASHMiR (1).yml b/regex_patterns/KASHMiR (1).yml
deleted file mode 100644
index 9917db3..0000000
--- a/regex_patterns/KASHMiR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'KASHMiR'
-'pattern': '(?<=^|[\s.-])KASHMiR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/KASHMiR.yml b/regex_patterns/KASHMiR.yml
index f671744..bd70882 100644
--- a/regex_patterns/KASHMiR.yml
+++ b/regex_patterns/KASHMiR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])KASHMiR\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/KAWAiREMUX.yml b/regex_patterns/KAWAiREMUX.yml
deleted file mode 100644
index 790bb44..0000000
--- a/regex_patterns/KAWAiREMUX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'KAWAiREMUX'
-pattern: \b(KAWAiREMUX)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/KC (1).yml b/regex_patterns/KC (1).yml
deleted file mode 100644
index 5cd7700..0000000
--- a/regex_patterns/KC (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for AI Upscales'
-'name': 'KC'
-'pattern': '(?<=^|[\s.-])KC\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/KC.yml b/regex_patterns/KC.yml
index 28d83e7..4b71aac 100644
--- a/regex_patterns/KC.yml
+++ b/regex_patterns/KC.yml
@@ -1,6 +1,7 @@
 name: KC
-pattern: ^(KC)$
-description: ''
+pattern: (?<=^|[\s.-])KC\b
+description: Banned for AI Upscales
 tags:
 - Release Group
-tests: null
\ No newline at end of file
+- UnWanted
+tests: []
diff --git a/regex_patterns/KCW (1).yml b/regex_patterns/KCW (1).yml
deleted file mode 100644
index 04056aa..0000000
--- a/regex_patterns/KCW (1).yml	
+++ /dev/null
@@ -1,10 +0,0 @@
-'description': 'Kocowa is an American over-the-top streaming service headquartered
-  in Los Angeles as a joint venture between the top three Korean broadcast networks
-  to provide Korean entertainment including K-dramas, K-reality, K-variety, and K-pop
-  to the Americas and all with multi-language subtitles.'
-'name': 'KCW'
-'pattern': '\b(KCW|Kocowa)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/KCW.yml b/regex_patterns/KCW.yml
index c0c90ed..1b3a28e 100644
--- a/regex_patterns/KCW.yml
+++ b/regex_patterns/KCW.yml
@@ -1,7 +1,10 @@
 name: KCW
 pattern: \b(KCW|Kocowa)\b
-description: Kocowa is an American over-the-top streaming service headquartered in Los Angeles as a joint venture between the top three Korean broadcast networks to provide Korean entertainment including K-dramas, K-reality, K-variety, and K-pop to the Americas and all with multi-language subtitles.
+description: Kocowa is an American over-the-top streaming service headquartered in
+  Los Angeles as a joint venture between the top three Korean broadcast networks to
+  provide Korean entertainment including K-dramas, K-reality, K-variety, and K-pop
+  to the Americas and all with multi-language subtitles.
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests: []
diff --git a/regex_patterns/KEKMASTERS.yml b/regex_patterns/KEKMASTERS.yml
deleted file mode 100644
index 629676b..0000000
--- a/regex_patterns/KEKMASTERS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'KEKMASTERS'
-pattern: \b(KEKMASTERS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KH (1).yml b/regex_patterns/KH (1).yml
deleted file mode 100644
index 60595b0..0000000
--- a/regex_patterns/KH (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'KH'
-'pattern': '(?<=^|[\s.-])KH\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/KH.yml b/regex_patterns/KH.yml
index 58751fc..32a497d 100644
--- a/regex_patterns/KH.yml
+++ b/regex_patterns/KH.yml
@@ -1,6 +1,7 @@
-name: 'KH'
-pattern: \b(KH)\b
+name: KH
+pattern: (?<=^|[\s.-])KH\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/KHN.yml b/regex_patterns/KHN.yml
deleted file mode 100644
index cc4f7b4..0000000
--- a/regex_patterns/KHN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: KHN
-pattern: ^(KHN)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KIRA.yml b/regex_patterns/KIRA.yml
deleted file mode 100644
index be3dac8..0000000
--- a/regex_patterns/KIRA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: KIRA
-pattern: ^(KIRA)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/KNiVES (1).yml b/regex_patterns/KNiVES (1).yml
deleted file mode 100644
index 112dd17..0000000
--- a/regex_patterns/KNiVES (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'KNiVES'
-'pattern': '(?<=^|[\s.-])KNiVES\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/KNiVES.yml b/regex_patterns/KNiVES.yml
index 07714dc..65a6025 100644
--- a/regex_patterns/KNiVES.yml
+++ b/regex_patterns/KNiVES.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])KNiVES\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/KQRM.yml b/regex_patterns/KQRM.yml
deleted file mode 100644
index d833ed7..0000000
--- a/regex_patterns/KQRM.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'KQRM'
-pattern: \b(KQRM)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KRP.yml b/regex_patterns/KRP.yml
deleted file mode 100644
index f09da6e..0000000
--- a/regex_patterns/KRP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'KRP'
-pattern: \b(KRP)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KRaLiMaRKo (1).yml b/regex_patterns/KRaLiMaRKo (1).yml
deleted file mode 100644
index 3674949..0000000
--- a/regex_patterns/KRaLiMaRKo (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'KRaLiMaRKo'
-'pattern': '(?<=^|[\s.-])KRaLiMaRKo\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/KRaLiMaRKo.yml b/regex_patterns/KRaLiMaRKo.yml
index 331d66a..dd29192 100644
--- a/regex_patterns/KRaLiMaRKo.yml
+++ b/regex_patterns/KRaLiMaRKo.yml
@@ -1,6 +1,7 @@
-name: 'KRaLiMaRKo'
-pattern: ^(KRaLiMaRKo)$
+name: KRaLiMaRKo
+pattern: (?<=^|[\s.-])KRaLiMaRKo\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/KS (Not Dual Audio).yml b/regex_patterns/KS (Not Dual Audio).yml
deleted file mode 100644
index 77f9f0a..0000000
--- a/regex_patterns/KS (Not Dual Audio).yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: KS (Not Dual Audio)
-pattern: ^(?!.*(dual[ ._-]?audio|[([]dual[])]|(JA|ZH|KO)\+EN|EN\+(JA|ZH|KO))).*\bKS\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/KaiDubs (Not Dual Audio).yml b/regex_patterns/KaiDubs (Not Dual Audio).yml
deleted file mode 100644
index d1ddc17..0000000
--- a/regex_patterns/KaiDubs (Not Dual Audio).yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: KaiDubs (Not Dual Audio)
-pattern: ^(?!.*(dual[ ._-]?audio|[([]dual[])]|(JA|ZH|KO)\+EN|EN\+(JA|ZH|KO))).*\b(KaiDubs)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Kaizoku.yml b/regex_patterns/Kaizoku.yml
deleted file mode 100644
index b789537..0000000
--- a/regex_patterns/Kaizoku.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Kaizoku'
-pattern: \b(AnimeKaizoku)\b|\[Kaizoku\]|-Kaizoku\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Kaleido (1).yml b/regex_patterns/Kaleido (1).yml
deleted file mode 100644
index 7b311db..0000000
--- a/regex_patterns/Kaleido (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Kaleido'
-'pattern': '(?<=^|[\s.-])Kaleido\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Kaleido.yml b/regex_patterns/Kaleido.yml
index 09011e0..78ae1ba 100644
--- a/regex_patterns/Kaleido.yml
+++ b/regex_patterns/Kaleido.yml
@@ -1,6 +1,7 @@
-name: 'Kaleido'
-pattern: \b(Kaleido)\b
+name: Kaleido
+pattern: (?<=^|[\s.-])Kaleido\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Kametsu (1).yml b/regex_patterns/Kametsu (1).yml
deleted file mode 100644
index e837387..0000000
--- a/regex_patterns/Kametsu (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Kametsu'
-'pattern': '(?<=^|[\s.-])Kametsu\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Kametsu.yml b/regex_patterns/Kametsu.yml
index 5409a81..81f4c80 100644
--- a/regex_patterns/Kametsu.yml
+++ b/regex_patterns/Kametsu.yml
@@ -1,6 +1,7 @@
-name: 'Kametsu'
-pattern: \b(Kametsu)\b
+name: Kametsu
+pattern: (?<=^|[\s.-])Kametsu\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/KamiFS.yml b/regex_patterns/KamiFS.yml
deleted file mode 100644
index 7f3c542..0000000
--- a/regex_patterns/KamiFS.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: KamiFS
-pattern: \b(KamiFS)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Kanjouteki.yml b/regex_patterns/Kanjouteki.yml
deleted file mode 100644
index d1d7381..0000000
--- a/regex_patterns/Kanjouteki.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Kanjouteki'
-pattern: \b(Kanjouteki)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Kantai.yml b/regex_patterns/Kantai.yml
deleted file mode 100644
index b4d1659..0000000
--- a/regex_patterns/Kantai.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Kantai'
-pattern: \[Kantai\]|-Kantai\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Kawaiika-Raws.yml b/regex_patterns/Kawaiika-Raws.yml
deleted file mode 100644
index 8246a1f..0000000
--- a/regex_patterns/Kawaiika-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Kawaiika-Raws'
-pattern: Kawaiika[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KiMCHI.yml b/regex_patterns/KiMCHI.yml
deleted file mode 100644
index 920d51e..0000000
--- a/regex_patterns/KiMCHI.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: KiMCHI
-pattern: ^(KiMCHI)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/KiNGDOM.yml b/regex_patterns/KiNGDOM.yml
deleted file mode 100644
index 2032194..0000000
--- a/regex_patterns/KiNGDOM.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: KiNGDOM
-pattern: ^(KiNGDOM)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/KiNGS (1).yml b/regex_patterns/KiNGS (1).yml
deleted file mode 100644
index cfc6413..0000000
--- a/regex_patterns/KiNGS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'KiNGS'
-'pattern': '(?<=^|[\s.-])KiNGS\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/KiNGS.yml b/regex_patterns/KiNGS.yml
index b25f4b7..38d1058 100644
--- a/regex_patterns/KiNGS.yml
+++ b/regex_patterns/KiNGS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])KiNGS\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/Kirion.yml b/regex_patterns/Kirion.yml
deleted file mode 100644
index 13f1ea4..0000000
--- a/regex_patterns/Kirion.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Kirion'
-pattern: \b(Kirion)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Kitsune (1).yml b/regex_patterns/Kitsune (1).yml
deleted file mode 100644
index 68a0b7b..0000000
--- a/regex_patterns/Kitsune (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Kitsune'
-'pattern': '(?<=^|[\s.-])Kitsune\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/Kitsune.yml b/regex_patterns/Kitsune.yml
index d30379f..99160bc 100644
--- a/regex_patterns/Kitsune.yml
+++ b/regex_patterns/Kitsune.yml
@@ -1,7 +1,7 @@
-name: 'Kitsune'
-pattern: "^(Kitsune)$"
+name: Kitsune
+pattern: (?<=^|[\s.-])Kitsune\b
 description: ''
 tags:
 - Release Group
-- TRaSH
+- WEB-DL
 tests: []
diff --git a/regex_patterns/KiyoshiStar.yml b/regex_patterns/KiyoshiStar.yml
deleted file mode 100644
index 7f9e730..0000000
--- a/regex_patterns/KiyoshiStar.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'KiyoshiStar'
-pattern: \b(KS|KiyoshiStar)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Koi-Raws.yml b/regex_patterns/Koi-Raws.yml
deleted file mode 100644
index f67fd8a..0000000
--- a/regex_patterns/Koi-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Koi-Raws'
-pattern: Koi[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Koitern.yml b/regex_patterns/Koitern.yml
deleted file mode 100644
index 796063a..0000000
--- a/regex_patterns/Koitern.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Koitern'
-pattern: \b(Koitern)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Koten_Gars (1).yml b/regex_patterns/Koten_Gars (1).yml
deleted file mode 100644
index 871dd97..0000000
--- a/regex_patterns/Koten_Gars (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Koten_Gars'
-'pattern': '(?<=^|[\s.-])Koten_Gars\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Koten_Gars.yml b/regex_patterns/Koten_Gars.yml
index e1bffc0..ef652d4 100644
--- a/regex_patterns/Koten_Gars.yml
+++ b/regex_patterns/Koten_Gars.yml
@@ -1,6 +1,7 @@
-name: 'Koten_Gars'
-pattern: \b(Koten[ ._-]Gars)\b
+name: Koten_Gars
+pattern: (?<=^|[\s.-])Koten_Gars\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Kulot.yml b/regex_patterns/Kulot.yml
deleted file mode 100644
index 7abb963..0000000
--- a/regex_patterns/Kulot.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Kulot'
-pattern: \b(Kulot)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/L0SERNIGHT.yml b/regex_patterns/L0SERNIGHT.yml
deleted file mode 100644
index 093ab5d..0000000
--- a/regex_patterns/L0SERNIGHT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: L0SERNIGHT
-pattern: ^(L0SERNIGHT)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/LAMA (1).yml b/regex_patterns/LAMA (1).yml
deleted file mode 100644
index 8d4ee7b..0000000
--- a/regex_patterns/LAMA (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Retagging'
-'name': 'LAMA'
-'pattern': '(?<=^|[\s.-])LAMA\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/LAMA.yml b/regex_patterns/LAMA.yml
index 0653255..b51d71f 100644
--- a/regex_patterns/LAMA.yml
+++ b/regex_patterns/LAMA.yml
@@ -1,6 +1,7 @@
 name: LAMA
 pattern: (?<=^|[\s.-])LAMA\b
-description: ''
+description: Banned for Retagging
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/LAZARUS (1).yml b/regex_patterns/LAZARUS (1).yml
deleted file mode 100644
index a4fce5b..0000000
--- a/regex_patterns/LAZARUS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LAZARUS'
-'pattern': '(?<=^|[\s.-])LAZARUS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/LAZARUS.yml b/regex_patterns/LAZARUS.yml
index 9cc751f..0fb910b 100644
--- a/regex_patterns/LAZARUS.yml
+++ b/regex_patterns/LAZARUS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LAZARUS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/LAZY (1).yml b/regex_patterns/LAZY (1).yml
deleted file mode 100644
index b50a391..0000000
--- a/regex_patterns/LAZY (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "LAZY" when preceded by whitespace, a hyphen or dot'
-'name': 'LAZY'
-'pattern': '(?<=^|[\s.-])LAZY\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/LAZY.yml b/regex_patterns/LAZY.yml
index a2ca719..901e6ba 100644
--- a/regex_patterns/LAZY.yml
+++ b/regex_patterns/LAZY.yml
@@ -1,6 +1,7 @@
 name: LAZY
-pattern: ^(LAZY)$
-description: ''
+pattern: (?<=^|[\s.-])LAZY\b
+description: Matches "LAZY" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/LCE.yml b/regex_patterns/LCE.yml
deleted file mode 100644
index 11199d0..0000000
--- a/regex_patterns/LCE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'LCE'
-pattern: \b(LCE)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/LEGi0N (1).yml b/regex_patterns/LEGi0N (1).yml
deleted file mode 100644
index 9ae0ce1..0000000
--- a/regex_patterns/LEGi0N (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LEGi0N'
-'pattern': '(?<=^|[\s.-])LEGi0N\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/LEGi0N.yml b/regex_patterns/LEGi0N.yml
index 8f5a732..174de42 100644
--- a/regex_patterns/LEGi0N.yml
+++ b/regex_patterns/LEGi0N.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LEGi0N\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/LM.yml b/regex_patterns/LM.yml
index 5a9b501..3fd3f77 100644
--- a/regex_patterns/LM.yml
+++ b/regex_patterns/LM.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'LM'
-'pattern': '(?<=^|[\s.-])LM\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: LM
+pattern: (?<=^|[\s.-])LM\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/LSt (1).yml b/regex_patterns/LSt (1).yml
deleted file mode 100644
index 651f2c9..0000000
--- a/regex_patterns/LSt (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LSt'
-'pattern': '(?<=^|[\s.-])LSt\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
diff --git a/regex_patterns/LSt.yml b/regex_patterns/LSt.yml
index 534091a..e9d9340 100644
--- a/regex_patterns/LSt.yml
+++ b/regex_patterns/LSt.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LSt\b
 description: ''
 tags:
 - Release Group
-tests: null
+- HEVC
+tests: []
diff --git a/regex_patterns/LUCY.yml b/regex_patterns/LUCY.yml
deleted file mode 100644
index 2035788..0000000
--- a/regex_patterns/LUCY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: LUCY
-pattern: ^(LUCY)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/LYS.yml b/regex_patterns/LYS.yml
deleted file mode 100644
index e481008..0000000
--- a/regex_patterns/LYS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: LYS
-pattern: (?<=^|[\s.-])LYS\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/LYS1TH3A (1).yml b/regex_patterns/LYS1TH3A (1).yml
deleted file mode 100644
index 017f6ec..0000000
--- a/regex_patterns/LYS1TH3A (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LYS1TH3A'
-'pattern': '(?<=^|[\s.-])LYS1TH3A\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/LYS1TH3A.yml b/regex_patterns/LYS1TH3A.yml
index 34b47e4..faba9ac 100644
--- a/regex_patterns/LYS1TH3A.yml
+++ b/regex_patterns/LYS1TH3A.yml
@@ -1,6 +1,7 @@
 name: LYS1TH3A
-pattern: \b(LYS1TH3A)\b
+pattern: (?<=^|[\s.-])LYS1TH3A\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Anime
+tests: []
diff --git a/regex_patterns/LazyRemux (1).yml b/regex_patterns/LazyRemux (1).yml
deleted file mode 100644
index 72042c0..0000000
--- a/regex_patterns/LazyRemux (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LazyRemux'
-'pattern': '(?<=^|[\s.-])LazyRemux\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/LazyRemux.yml b/regex_patterns/LazyRemux.yml
index dfe34d1..03e71eb 100644
--- a/regex_patterns/LazyRemux.yml
+++ b/regex_patterns/LazyRemux.yml
@@ -1,6 +1,7 @@
-name: 'LazyRemux'
-pattern: \b(LazyRemux)\b
+name: LazyRemux
+pattern: (?<=^|[\s.-])LazyRemux\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Leffe.yml b/regex_patterns/Leffe.yml
deleted file mode 100644
index de0ad2a..0000000
--- a/regex_patterns/Leffe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Leffe
-pattern: ^(Leffe)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Legion.yml b/regex_patterns/Legion.yml
deleted file mode 100644
index 68de60b..0000000
--- a/regex_patterns/Legion.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Legion
-pattern: \[Legion\]|-Legion\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/LiGaS.yml b/regex_patterns/LiGaS.yml
deleted file mode 100644
index b8928e6..0000000
--- a/regex_patterns/LiGaS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: LiGaS
-pattern: ^(LiGaS)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/LiNG (1).yml b/regex_patterns/LiNG (1).yml
deleted file mode 100644
index 985ed02..0000000
--- a/regex_patterns/LiNG (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LiNG'
-'pattern': '(?<=^|[\s.-])LiNG\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/LiNG.yml b/regex_patterns/LiNG.yml
index ae513fe..fa3e625 100644
--- a/regex_patterns/LiNG.yml
+++ b/regex_patterns/LiNG.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LiNG\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Lia.yml b/regex_patterns/Lia.yml
deleted file mode 100644
index ffec10f..0000000
--- a/regex_patterns/Lia.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Lia'
-pattern: \[Lia\]|-Lia\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Liber8.yml b/regex_patterns/Liber8.yml
deleted file mode 100644
index 986ee9a..0000000
--- a/regex_patterns/Liber8.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Liber8
-pattern: ^(Liber8)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Licca.yml b/regex_patterns/Licca.yml
deleted file mode 100644
index b365cd5..0000000
--- a/regex_patterns/Licca.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Licca'
-pattern: \b(Licca)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Lilith-Raws.yml b/regex_patterns/Lilith-Raws.yml
deleted file mode 100644
index 4096ed1..0000000
--- a/regex_patterns/Lilith-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Lilith-Raws'
-pattern: Lilith[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/LittleBakas (1).yml b/regex_patterns/LittleBakas (1).yml
deleted file mode 100644
index 9124bf3..0000000
--- a/regex_patterns/LittleBakas (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LittleBakas'
-'pattern': '(?<=^|[\s.-])LittleBakas\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/LittleBakas.yml b/regex_patterns/LittleBakas.yml
index 7677113..a09ccac 100644
--- a/regex_patterns/LittleBakas.yml
+++ b/regex_patterns/LittleBakas.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LittleBakas\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/LoRD (1).yml b/regex_patterns/LoRD (1).yml
deleted file mode 100644
index ad88d2e..0000000
--- a/regex_patterns/LoRD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LoRD'
-'pattern': '(?<=^|[\s.-])LoRD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/LoRD.yml b/regex_patterns/LoRD.yml
index 121356a..81983f0 100644
--- a/regex_patterns/LoRD.yml
+++ b/regex_patterns/LoRD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LoRD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/LolHD (1).yml b/regex_patterns/LolHD (1).yml
deleted file mode 100644
index 8127375..0000000
--- a/regex_patterns/LolHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'LolHD'
-'pattern': '(?<=^|[\s.-])LolHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/LolHD.yml b/regex_patterns/LolHD.yml
index 3f97fbb..97b42da 100644
--- a/regex_patterns/LolHD.yml
+++ b/regex_patterns/LolHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])LolHD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/LoliHouse.yml b/regex_patterns/LoliHouse.yml
deleted file mode 100644
index dbbabdf..0000000
--- a/regex_patterns/LoliHouse.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'LoliHouse'
-pattern: \b(LoliHouse)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/LostYears.yml b/regex_patterns/LostYears.yml
deleted file mode 100644
index c24eb52..0000000
--- a/regex_patterns/LostYears.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: LostYears
-pattern: \b(LostYears)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/LowPower-Raws.yml b/regex_patterns/LowPower-Raws.yml
deleted file mode 100644
index a0fcf10..0000000
--- a/regex_patterns/LowPower-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'LowPower-Raws'
-pattern: LowPower[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Lucifer (1).yml b/regex_patterns/Lucifer (1).yml
deleted file mode 100644
index 6895161..0000000
--- a/regex_patterns/Lucifer (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Lucifer'
-'pattern': '(?<=^|[\s.-])Lucifer\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Lucifer.yml b/regex_patterns/Lucifer.yml
index 0bcf247..97e322c 100644
--- a/regex_patterns/Lucifer.yml
+++ b/regex_patterns/Lucifer.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Lucifer\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Lulu (1).yml b/regex_patterns/Lulu (1).yml
deleted file mode 100644
index 824ef7c..0000000
--- a/regex_patterns/Lulu (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Lulu'
-'pattern': '(?<=^|[\s.-])Lulu\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Lulu.yml b/regex_patterns/Lulu.yml
index 4295ec4..ff500a8 100644
--- a/regex_patterns/Lulu.yml
+++ b/regex_patterns/Lulu.yml
@@ -1,6 +1,7 @@
 name: Lulu
-pattern: \[Lulu\]|-Lulu\b
+pattern: (?<=^|[\s.-])Lulu\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/M@nI.yml b/regex_patterns/M@nI.yml
deleted file mode 100644
index c2edf99..0000000
--- a/regex_patterns/M@nI.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'M@nI'
-pattern: \b(M@nI)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MALUS (1).yml b/regex_patterns/MALUS (1).yml
deleted file mode 100644
index cfd1a77..0000000
--- a/regex_patterns/MALUS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'MALUS'
-'pattern': '(?<=^|[\s.-])MALUS\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/MALUS.yml b/regex_patterns/MALUS.yml
index 6b10273..46d52ba 100644
--- a/regex_patterns/MALUS.yml
+++ b/regex_patterns/MALUS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])MALUS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/MC.yml b/regex_patterns/MC.yml
deleted file mode 100644
index dbb205b..0000000
--- a/regex_patterns/MC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: MC
-pattern: \b(MC)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MCLR.yml b/regex_patterns/MCLR.yml
deleted file mode 100644
index 9f2be5b..0000000
--- a/regex_patterns/MCLR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MCLR'
-pattern: \b(MCLR)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MCR.yml b/regex_patterns/MCR.yml
deleted file mode 100644
index 6b67c28..0000000
--- a/regex_patterns/MCR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MCR'
-pattern: \b(MCR)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MD.yml b/regex_patterns/MD.yml
deleted file mode 100644
index fbac851..0000000
--- a/regex_patterns/MD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MD'
-pattern: \[MD\]|-MD\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MGD.yml b/regex_patterns/MGD.yml
deleted file mode 100644
index 4170cc1..0000000
--- a/regex_patterns/MGD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MGD'
-pattern: \b(MGD)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MK.yml b/regex_patterns/MK.yml
deleted file mode 100644
index 42786c2..0000000
--- a/regex_patterns/MK.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MK'
-pattern: \b(MK)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MKVULTRA.yml b/regex_patterns/MKVULTRA.yml
deleted file mode 100644
index d7a5ed0..0000000
--- a/regex_patterns/MKVULTRA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MKVULTRA'
-pattern: \b(MKVULTRA)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/MTBB (1).yml b/regex_patterns/MTBB (1).yml
deleted file mode 100644
index 6d6dbc4..0000000
--- a/regex_patterns/MTBB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'MTBB'
-'pattern': '(?<=^|[\s.-])MTBB\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/MTBB.yml b/regex_patterns/MTBB.yml
index 22c6d10..3a73f68 100644
--- a/regex_patterns/MTBB.yml
+++ b/regex_patterns/MTBB.yml
@@ -1,6 +1,7 @@
-name: 'MTBB'
-pattern: \b(MTBB)\b
+name: MTBB
+pattern: (?<=^|[\s.-])MTBB\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/MTeam (1).yml b/regex_patterns/MTeam (1).yml
deleted file mode 100644
index 4cdd0d7..0000000
--- a/regex_patterns/MTeam (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'MTeam'
-'pattern': '(?<=^|[\s.-])MTeam\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/MTeam.yml b/regex_patterns/MTeam.yml
index 7b51a07..e01c751 100644
--- a/regex_patterns/MTeam.yml
+++ b/regex_patterns/MTeam.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])MTeam\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/MZABI (1).yml b/regex_patterns/MZABI (1).yml
deleted file mode 100644
index 4d863fd..0000000
--- a/regex_patterns/MZABI (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'MZABI'
-'pattern': '(?<=^|[\s.-])MZABI\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/MZABI.yml b/regex_patterns/MZABI.yml
index b2b25fc..7a2dbef 100644
--- a/regex_patterns/MZABI.yml
+++ b/regex_patterns/MZABI.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])MZABI\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/MainFrame (1).yml b/regex_patterns/MainFrame (1).yml
deleted file mode 100644
index ed199e7..0000000
--- a/regex_patterns/MainFrame (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'MainFrame'
-'pattern': '(?<=^|[\s.-])MainFrame\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/MainFrame.yml b/regex_patterns/MainFrame.yml
index be804ac..e7892d1 100644
--- a/regex_patterns/MainFrame.yml
+++ b/regex_patterns/MainFrame.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])MainFrame\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Man.K.yml b/regex_patterns/Man.K.yml
deleted file mode 100644
index 6a70050..0000000
--- a/regex_patterns/Man.K.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Man.K'
-pattern: \b(Man\.K)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MarkII.yml b/regex_patterns/MarkII.yml
deleted file mode 100644
index 7f43e32..0000000
--- a/regex_patterns/MarkII.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: MarkII
-pattern: ^(MarkII)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Matsya.yml b/regex_patterns/Matsya.yml
deleted file mode 100644
index 8e75525..0000000
--- a/regex_patterns/Matsya.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Matsya
-pattern: \b(Matsya)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Max (1).yml b/regex_patterns/Max (1).yml
deleted file mode 100644
index 7a25c4c..0000000
--- a/regex_patterns/Max (1).yml	
+++ /dev/null
@@ -1,60 +0,0 @@
-'description': 'Max, formerly (and in some regions still) known as HBO Max, is an
-  American subscription video on-demand over-the-top streaming service. The platform
-  offers content from the libraries of Warner Bros., Discovery, HBO, CNN, Cartoon
-  Network, Adult Swim, Animal Planet, TBS, TNT, Eurosport, and their related brands.'
-'name': 'Max'
-'pattern': '\b((?<!hbo[ ._-])max)\b(?=[ ._-]web[ ._-]?(dl|rip)\b)'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Dune Prophecy S01E02 Two Wolves 1080p MAX WEB-DL DDP5 1 Atmos H 264-FLUX'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan':
-    'end': 41
-    'start': 38
-  'matchedContent': 'MAX'
-  'matchedGroups':
-  - 'MAX'
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Guardians of the Galaxy Vol. 3 (2023) IMAX (2160p MA WEB-DL Hybrid H265
-    DV HDR DDP Atmos 5.1 English - HONE)'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Max.Verstappen.Anatomy.of.a.Champion.S01E01.1080p.WEB.h264-B2B'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Silicon Valley S06 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Dune Prophecy S01E01 The Hidden Hand 2160p MAX WEB-DL DDP 5.1 Atmos DV
-    HDR H.265-FLUX'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan':
-    'end': 46
-    'start': 43
-  'matchedContent': 'MAX'
-  'matchedGroups':
-  - 'MAX'
-  - 'DL'
-  'passes': true
diff --git a/regex_patterns/Max Rename.yml b/regex_patterns/Max Rename.yml
index 6a4bfbb..c216947 100644
--- a/regex_patterns/Max Rename.yml	
+++ b/regex_patterns/Max Rename.yml	
@@ -1,60 +1,60 @@
-'description': 'Max, formerly (and in some regions still) known as HBO Max, is an
-  American subscription video on-demand over-the-top streaming service. The platform
-  offers content from the libraries of Warner Bros., Discovery, HBO, CNN, Cartoon
-  Network, Adult Swim, Animal Planet, TBS, TNT, Eurosport, and their related brands.'
-'name': 'Max Rename'
-'pattern': '\[(MAX)\b|\b(MAX)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Dune Prophecy S01E02 Two Wolves 1080p MAX WEB-DL DDP5 1 Atmos H 264-FLUX'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan':
-    'end': 41
-    'start': 38
-  'matchedContent': 'MAX'
-  'matchedGroups':
-  - 'MAX'
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Guardians of the Galaxy Vol. 3 (2023) IMAX (2160p MA WEB-DL Hybrid H265
-    DV HDR DDP Atmos 5.1 English - HONE)'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Max.Verstappen.Anatomy.of.a.Champion.S01E01.1080p.WEB.h264-B2B'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Silicon Valley S06 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Dune Prophecy S01E01 The Hidden Hand 2160p MAX WEB-DL DDP 5.1 Atmos DV
-    HDR H.265-FLUX'
-  'lastRun': '2024-12-06T02:54:31.077207'
-  'matchSpan':
-    'end': 46
-    'start': 43
-  'matchedContent': 'MAX'
-  'matchedGroups':
-  - 'MAX'
-  - 'DL'
-  'passes': true
+name: Max Rename
+pattern: \[(MAX)\b|\b(MAX)\]
+description: Max, formerly (and in some regions still) known as HBO Max, is an American
+  subscription video on-demand over-the-top streaming service. The platform offers
+  content from the libraries of Warner Bros., Discovery, HBO, CNN, Cartoon Network,
+  Adult Swim, Animal Planet, TBS, TNT, Eurosport, and their related brands.
+tags:
+- Streaming Service
+- WEB-DL
+tests:
+- expected: true
+  id: 1
+  input: Dune Prophecy S01E02 Two Wolves 1080p MAX WEB-DL DDP5 1 Atmos H 264-FLUX
+  lastRun: '2024-12-06T02:54:31.077207'
+  matchSpan:
+    end: 41
+    start: 38
+  matchedContent: MAX
+  matchedGroups:
+  - MAX
+  - DL
+  passes: true
+- expected: false
+  id: 2
+  input: Guardians of the Galaxy Vol. 3 (2023) IMAX (2160p MA WEB-DL Hybrid H265 DV
+    HDR DDP Atmos 5.1 English - HONE)
+  lastRun: '2024-12-06T02:54:31.077207'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 3
+  input: Max.Verstappen.Anatomy.of.a.Champion.S01E01.1080p.WEB.h264-B2B
+  lastRun: '2024-12-06T02:54:31.077207'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 4
+  input: Silicon Valley S06 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX
+  lastRun: '2024-12-06T02:54:31.077207'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 5
+  input: Dune Prophecy S01E01 The Hidden Hand 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR
+    H.265-FLUX
+  lastRun: '2024-12-06T02:54:31.077207'
+  matchSpan:
+    end: 46
+    start: 43
+  matchedContent: MAX
+  matchedGroups:
+  - MAX
+  - DL
+  passes: true
diff --git a/regex_patterns/Max.yml b/regex_patterns/Max.yml
index 702d422..f149841 100644
--- a/regex_patterns/Max.yml
+++ b/regex_patterns/Max.yml
@@ -7,7 +7,6 @@ description: Max, formerly (and in some regions still) known as HBO Max, is an A
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Maximus.yml b/regex_patterns/Maximus.yml
deleted file mode 100644
index 799c581..0000000
--- a/regex_patterns/Maximus.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Maximus'
-pattern: \[Maximus\]|-Maximus\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MeGusta.yml b/regex_patterns/MeGusta.yml
deleted file mode 100644
index 85ec123..0000000
--- a/regex_patterns/MeGusta.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: MeGusta
-pattern: ^(MeGusta)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Metal.yml b/regex_patterns/Metal.yml
deleted file mode 100644
index e5cb795..0000000
--- a/regex_patterns/Metal.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Metal
-pattern: \[Metal\]|-Metal\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Metaljerk.yml b/regex_patterns/Metaljerk.yml
deleted file mode 100644
index a18a132..0000000
--- a/regex_patterns/Metaljerk.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Metaljerk'
-pattern: \b(Metaljerk)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MiMiC (1).yml b/regex_patterns/MiMiC (1).yml
deleted file mode 100644
index 76b491f..0000000
--- a/regex_patterns/MiMiC (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'MiMiC'
-'pattern': '(?<=^|[\s.-])MiMiC\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/MiMiC.yml b/regex_patterns/MiMiC.yml
index 13f2fab..6484271 100644
--- a/regex_patterns/MiMiC.yml
+++ b/regex_patterns/MiMiC.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])MiMiC\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/MiU.yml b/regex_patterns/MiU.yml
deleted file mode 100644
index 10e146e..0000000
--- a/regex_patterns/MiU.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: MiU
-pattern: ^(MiU)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MiniFreeza.yml b/regex_patterns/MiniFreeza.yml
deleted file mode 100644
index 0f3f4b4..0000000
--- a/regex_patterns/MiniFreeza.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MiniFreeza'
-pattern: \b(MiniFreeza)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MiniMTBB.yml b/regex_patterns/MiniMTBB.yml
deleted file mode 100644
index 1df36e8..0000000
--- a/regex_patterns/MiniMTBB.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MiniMTBB'
-pattern: \b(MiniMTBB)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MiniTheatre.yml b/regex_patterns/MiniTheatre.yml
deleted file mode 100644
index b7e34ad..0000000
--- a/regex_patterns/MiniTheatre.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MiniTheatre'
-pattern: \b(MiniTheatre)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MinisCuba.yml b/regex_patterns/MinisCuba.yml
deleted file mode 100644
index 22d27be..0000000
--- a/regex_patterns/MinisCuba.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'MinisCuba'
-pattern: \b(MinisCuba)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Mites.yml b/regex_patterns/Mites.yml
deleted file mode 100644
index 89930e5..0000000
--- a/regex_patterns/Mites.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Mites'
-pattern: \b(Mites)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Modders-Bay.yml b/regex_patterns/Modders-Bay.yml
deleted file mode 100644
index 99e623a..0000000
--- a/regex_patterns/Modders-Bay.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Modders Bay'
-pattern: \b(Modders[ .-]?Bay)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MovieMan (1).yml b/regex_patterns/MovieMan (1).yml
deleted file mode 100644
index 38c7937..0000000
--- a/regex_patterns/MovieMan (1).yml	
+++ /dev/null
@@ -1,17 +0,0 @@
-'description': ''
-'name': 'MovieMan'
-'pattern': '(?<=^|[\s.-])MovieMan\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Blade.Runner.2049.2017.1080p.UHD.BluRay.HDR.x265.DDP.5.1-MovieMan'
-  'lastRun': '2025-01-14T10:00:33.086158'
-  'matchSpan':
-    'end': 65
-    'start': 57
-  'matchedContent': 'MovieMan'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/MovieMan.yml b/regex_patterns/MovieMan.yml
index ba90215..d24c94a 100644
--- a/regex_patterns/MovieMan.yml
+++ b/regex_patterns/MovieMan.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])MovieMan\b
 description: ''
 tags:
 - Release Group
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Movies Anywhere (1).yml b/regex_patterns/Movies Anywhere (1).yml
deleted file mode 100644
index 366ee7a..0000000
--- a/regex_patterns/Movies Anywhere (1).yml	
+++ /dev/null
@@ -1,92 +0,0 @@
-'description': 'Movies Anywhere (MA) is a cloud-based digital rights locker and over-the-top
-  streaming platform that allows users to stream and download purchased films, including
-  digital copies redeemed from codes found in home video releases as well as digital
-  purchases from participating services'
-'name': 'Movies Anywhere'
-'pattern': '\b(?<!dts[ .-]?hd[ .-]?)ma\b(?=.*\bweb[ ._-]?(dl|rip)\b)'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Scooby-Doo.In.Wheres.My.Mummy.2005.1080p.MA.WEB-DL.DDP5.1.H264-HHWEB.mkv'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan':
-    'end': 43
-    'start': 41
-  'matchedContent': 'MA'
-  'matchedGroups':
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Speak.No.Evil.2024.1080p.MA.WEB-DL.DDP5.1.Atmos.H.264-FLUX.mkv'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan':
-    'end': 27
-    'start': 25
-  'matchedContent': 'MA'
-  'matchedGroups':
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'The.Super.Mario.Bros.Movie.2023.1080p.MA.WEB-DL.DDP5.1.Atmos.H.264-CMaRioG.mkv'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan':
-    'end': 40
-    'start': 38
-  'matchedContent': 'MA'
-  'matchedGroups':
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Interstellar.2014.UHD.BluRay.2160p.DTS-HD.MA.5.1.HEVC.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'The.Amazing.Spider-Man.2012.1080p.Remastered.BluRay.DTSHD-MA.x264.D-Z0N3.mkv'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': '[ToonsHub] Orb On the Movements of the Earth S01E01 1080p ABEMA WEB-DL
-    AAC2.0 H.264'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': '[ToonsHub] Orb On the Movements of the Earth S01E01 1080p ABE MA WEB-DL
-    AAC2.0 H.264'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan':
-    'end': 64
-    'start': 62
-  'matchedContent': 'MA'
-  'matchedGroups':
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': '[ToonsHub] Orb On the Movements of the Earth S01E01 1080p ABE.MA WEB-DL
-    AAC2.0 H.264'
-  'lastRun': '2025-01-28T07:28:30.747386'
-  'matchSpan':
-    'end': 64
-    'start': 62
-  'matchedContent': 'MA'
-  'matchedGroups':
-  - 'DL'
-  'passes': true
diff --git a/regex_patterns/Movies Anywhere.yml b/regex_patterns/Movies Anywhere.yml
index 17a89dd..851315c 100644
--- a/regex_patterns/Movies Anywhere.yml	
+++ b/regex_patterns/Movies Anywhere.yml	
@@ -7,7 +7,6 @@ description: Movies Anywhere (MA) is a cloud-based digital rights locker and ove
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Mr.Deadpool.yml b/regex_patterns/Mr.Deadpool.yml
deleted file mode 100644
index 1f07283..0000000
--- a/regex_patterns/Mr.Deadpool.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Mr. Deadpool'
-pattern: \b(Mr\.Deadpool)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/MySiLU.yml b/regex_patterns/MySiLU.yml
deleted file mode 100644
index 9a207b9..0000000
--- a/regex_patterns/MySiLU.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: MySiLU
-pattern: ^(MySiLU)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Mysteria (1).yml b/regex_patterns/Mysteria (1).yml
deleted file mode 100644
index b6b6b1d..0000000
--- a/regex_patterns/Mysteria (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Mysteria'
-'pattern': '(?<=^|[\s.-])Mysteria\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Mysteria.yml b/regex_patterns/Mysteria.yml
index 74d2707..7c02c45 100644
--- a/regex_patterns/Mysteria.yml
+++ b/regex_patterns/Mysteria.yml
@@ -1,6 +1,7 @@
-name: 'Mysteria'
-pattern: \[Mysteria\]|-Mysteria\b
+name: Mysteria
+pattern: (?<=^|[\s.-])Mysteria\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/NAHOM.yml b/regex_patterns/NAHOM.yml
index 515c2c0..1a8eebc 100644
--- a/regex_patterns/NAHOM.yml
+++ b/regex_patterns/NAHOM.yml
@@ -1,7 +1,7 @@
-'description': 'Banned for Poor Quality Multi'
-'name': 'NAHOM'
-'pattern': '(?<=^|[\s.-])NAHOM\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: NAHOM
+pattern: (?<=^|[\s.-])NAHOM\b
+description: Banned for Poor Quality Multi
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/NC-Raws.yml b/regex_patterns/NC-Raws.yml
deleted file mode 100644
index 24059bb..0000000
--- a/regex_patterns/NC-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NC-Raws'
-pattern: NC[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NCmt (1).yml b/regex_patterns/NCmt (1).yml
deleted file mode 100644
index 6c519bd..0000000
--- a/regex_patterns/NCmt (1).yml	
+++ /dev/null
@@ -1,8 +0,0 @@
-'description': ''
-'name': 'NCmt'
-'pattern': '(?<=^|[\s.-])NCmt\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/NCmt.yml b/regex_patterns/NCmt.yml
index c5208b9..c7a5778 100644
--- a/regex_patterns/NCmt.yml
+++ b/regex_patterns/NCmt.yml
@@ -3,4 +3,6 @@ pattern: (?<=^|[\s.-])NCmt\b
 description: ''
 tags:
 - Release Group
+- Remux
+- Bluray
 tests: []
diff --git a/regex_patterns/NH.yml b/regex_patterns/NH.yml
deleted file mode 100644
index 1937abb..0000000
--- a/regex_patterns/NH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NH'
-pattern: \b(NH)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NINJACENTRAL.yml b/regex_patterns/NINJACENTRAL.yml
deleted file mode 100644
index e0dfbc6..0000000
--- a/regex_patterns/NINJACENTRAL.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NINJACENTRAL'
-pattern: '^(NINJACENTRAL)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NOSiViD (1).yml b/regex_patterns/NOSiViD (1).yml
deleted file mode 100644
index 643b210..0000000
--- a/regex_patterns/NOSiViD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'NOSiViD'
-'pattern': '(?<=^|[\s.-])NOSiViD\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/NOSiViD.yml b/regex_patterns/NOSiViD.yml
index d5ca809..7107279 100644
--- a/regex_patterns/NOSiViD.yml
+++ b/regex_patterns/NOSiViD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])NOSiViD\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/NPC.yml b/regex_patterns/NPC.yml
deleted file mode 100644
index aac0b23..0000000
--- a/regex_patterns/NPC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NPC'
-pattern: \[NPC\]|-NPC\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NPMS.yml b/regex_patterns/NPMS.yml
deleted file mode 100644
index 4c20d0b..0000000
--- a/regex_patterns/NPMS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NPMS'
-pattern: '^(NPMS)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NS.yml b/regex_patterns/NS.yml
deleted file mode 100644
index 64e6b97..0000000
--- a/regex_patterns/NS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NS'
-pattern: \b(NS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NSDAB.yml b/regex_patterns/NSDAB.yml
deleted file mode 100644
index 2fec611..0000000
--- a/regex_patterns/NSDAB.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: NSDAB
-pattern: \b(NSDAB)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NTG (1).yml b/regex_patterns/NTG (1).yml
deleted file mode 100644
index 561cf65..0000000
--- a/regex_patterns/NTG (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'NTG'
-'pattern': '(?<=^|[\s.-])NTG\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/NTG.yml b/regex_patterns/NTG.yml
index 2131cd8..6301639 100644
--- a/regex_patterns/NTG.yml
+++ b/regex_patterns/NTG.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])NTG\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/NTRM.yml b/regex_patterns/NTRM.yml
deleted file mode 100644
index cbb48c4..0000000
--- a/regex_patterns/NTRM.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NTRM'
-pattern: \b(NTRM)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NTb (1).yml b/regex_patterns/NTb (1).yml
deleted file mode 100644
index 05aea34..0000000
--- a/regex_patterns/NTb (1).yml	
+++ /dev/null
@@ -1,28 +0,0 @@
-'description': ''
-'name': 'NTb'
-'pattern': '(?<=^|[\s.-])NTb\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Zen - Grogu and Dust Bunnies (2022) 2160p DSNP WEB-DL H265 HDR DDP 5.1
-    English-NTb'
-  'lastRun': '2025-02-09T03:47:23.981431'
-  'matchSpan':
-    'end': 82
-    'start': 79
-  'matchedContent': 'NTb'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Jab.We.Met.2007.1080p.BluRay.DTS.x264-NTb.mkv'
-  'lastRun': '2025-02-09T03:47:23.981431'
-  'matchSpan':
-    'end': 41
-    'start': 38
-  'matchedContent': 'NTb'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/NTb.yml b/regex_patterns/NTb.yml
index 34a6ac6..1bceee5 100644
--- a/regex_patterns/NTb.yml
+++ b/regex_patterns/NTb.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])NTb\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/NYH.yml b/regex_patterns/NYH.yml
deleted file mode 100644
index 2abf095..0000000
--- a/regex_patterns/NYH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: NYH
-pattern: ^(NYH)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NanDesuKa.yml b/regex_patterns/NanDesuKa.yml
deleted file mode 100644
index 0725110..0000000
--- a/regex_patterns/NanDesuKa.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NanDesuKa'
-pattern: \b(NanDesuKa)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NanakoRaws.yml b/regex_patterns/NanakoRaws.yml
deleted file mode 100644
index c23cff3..0000000
--- a/regex_patterns/NanakoRaws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NanakoRaws'
-pattern: Nanako[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NemDiggers.yml b/regex_patterns/NemDiggers.yml
deleted file mode 100644
index f791159..0000000
--- a/regex_patterns/NemDiggers.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NemDiggers'
-pattern: \b(NemDiggers)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Netaro (1).yml b/regex_patterns/Netaro (1).yml
deleted file mode 100644
index 05ebc1a..0000000
--- a/regex_patterns/Netaro (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Netaro'
-'pattern': '(?<=^|[\s.-])Netaro\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Netaro.yml b/regex_patterns/Netaro.yml
index 2ed3f90..d391b5a 100644
--- a/regex_patterns/Netaro.yml
+++ b/regex_patterns/Netaro.yml
@@ -1,6 +1,7 @@
-name: 'Netaro'
-pattern: \b(Netaro)\b
+name: Netaro
+pattern: (?<=^|[\s.-])Netaro\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Netflix (1).yml b/regex_patterns/Netflix (1).yml
deleted file mode 100644
index f042a7e..0000000
--- a/regex_patterns/Netflix (1).yml	
+++ /dev/null
@@ -1,50 +0,0 @@
-'description': 'Netflix is an American subscription video on-demand over-the-top streaming
-  service. The service primarily distributes original and acquired films and television
-  shows from various genres, and it is available internationally in multiple languages.'
-'name': 'Netflix'
-'pattern': '\b(NF|Netflix)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The.Roast.of.Tom.Brady.2024.1080p.NF.WEB-DL.DDP5.1.H.264-NTb'
-  'lastRun': '2024-12-06T05:02:55.281514'
-  'matchSpan':
-    'end': 36
-    'start': 34
-  'matchedContent': 'NF'
-  'matchedGroups':
-  - 'NF'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Penn & Teller - Fool Us S01 1080p Netflix WEB-DL DD+ 2 0 x264-TrollHD'
-  'lastRun': '2024-12-06T05:02:55.281514'
-  'matchSpan':
-    'end': 41
-    'start': 34
-  'matchedContent': 'Netflix'
-  'matchedGroups':
-  - 'Netflix'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Anthony Jeselnik: Bones and All 2024 1080p NF WEB-DL DDP5 1 H 264-FLUX'
-  'lastRun': '2024-12-06T05:02:55.281514'
-  'matchSpan':
-    'end': 45
-    'start': 43
-  'matchedContent': 'NF'
-  'matchedGroups':
-  - 'NF'
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Its in the Game Madden NFL S01E02 1080p WEB H264-GloriousMongoose'
-  'lastRun': '2024-12-06T05:02:55.281514'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Netflix.yml b/regex_patterns/Netflix.yml
index 78d8c00..91c63cb 100644
--- a/regex_patterns/Netflix.yml
+++ b/regex_patterns/Netflix.yml
@@ -1,12 +1,11 @@
 name: Netflix
-pattern: \b(nf|netflix)\b
+pattern: \b(NF|Netflix)\b
 description: Netflix is an American subscription video on-demand over-the-top streaming
   service. The service primarily distributes original and acquired films and television
   shows from various genres, and it is available internationally in multiple languages.
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/New-raws.yml b/regex_patterns/New-raws.yml
deleted file mode 100644
index 1eb80bc..0000000
--- a/regex_patterns/New-raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'New-raws'
-pattern: New[ ._-]?(raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NhaNc3.yml b/regex_patterns/NhaNc3.yml
deleted file mode 100644
index 704b82a..0000000
--- a/regex_patterns/NhaNc3.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: NhaNc3
-pattern: ^(NhaNc3)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Nii-sama.yml b/regex_patterns/Nii-sama.yml
deleted file mode 100644
index cf96c47..0000000
--- a/regex_patterns/Nii-sama.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Nii-sama'
-pattern: \[Nii-sama\]|-Nii-sama\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Nishi-Taku.yml b/regex_patterns/Nishi-Taku.yml
deleted file mode 100644
index 8519f6e..0000000
--- a/regex_patterns/Nishi-Taku.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Nishi-Taku'
-pattern: \b(Nishi-Taku)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NoGroup (1).yml b/regex_patterns/NoGroup (1).yml
deleted file mode 100644
index 8f2196f..0000000
--- a/regex_patterns/NoGroup (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'NoGroup'
-'pattern': '(?<=^|[\s.-])NoGr(ou)?p\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/NoGroup.yml b/regex_patterns/NoGroup.yml
index f896751..470abe0 100644
--- a/regex_patterns/NoGroup.yml
+++ b/regex_patterns/NoGroup.yml
@@ -1,6 +1,7 @@
 name: NoGroup
-pattern: NoGr(ou)?p
+pattern: (?<=^|[\s.-])NoGr(ou)?p\b
 description: ''
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/Nokou.yml b/regex_patterns/Nokou.yml
deleted file mode 100644
index 2814822..0000000
--- a/regex_patterns/Nokou.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Nokou'
-pattern: \b(Nokou)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Non Retail HDR Formats (1).yml b/regex_patterns/Non Retail HDR Formats (1).yml
deleted file mode 100644
index aa7a10a..0000000
--- a/regex_patterns/Non Retail HDR Formats (1).yml	
+++ /dev/null
@@ -1,91 +0,0 @@
-'description': 'Matches Dolby Vision OR HDR10+. Needed to match release groups who
-  create custom HDR layers. '
-'name': 'Non Retail HDR Formats'
-'pattern': '(?:(?<=^(?!.*\b(HLG|PQ|SDR)(\b|\d)).*?)HDR10(\+|P(lus)?))|\b(dv(?![ .](HLG|SDR))|dovi|dolby[
-  .]?vision)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests':
-- 'expected': true
-  'id': 5
-  'input': 'MovieName.1080p.DV.mkv'
-  'lastRun': '2025-01-06T14:39:44.667920'
-  'matchSpan':
-    'end': 18
-    'start': 16
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - 'DV'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'MovieName.4K.Dolby Vision.IMAX.mkv'
-  'lastRun': '2025-01-06T14:39:44.667920'
-  'matchSpan':
-    'end': 25
-    'start': 13
-  'matchedContent': 'Dolby Vision'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - 'Dolby Vision'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'MovieName.2023.4K.DV.HLG.mkv'
-  'lastRun': '2025-01-06T14:39:44.667920'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 8
-  'input': 'MovieName.2023.4K.DV.SDR.mkv'
-  'lastRun': '2025-01-06T14:39:44.667920'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'MovieName.4K.DV.SDR.Dovi.mkv'
-  'lastRun': '2025-01-06T14:39:44.667920'
-  'matchSpan':
-    'end': 24
-    'start': 20
-  'matchedContent': 'Dovi'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - 'Dovi'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Schindler''s List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+
-    TrueHD Atmos 7.1 English-WiLDCAT'
-  'lastRun': '2025-01-06T14:39:44.667920'
-  'matchSpan':
-    'end': 61
-    'start': 59
-  'matchedContent': 'DV'
-  'matchedGroups':
-  - null
-  - null
-  - null
-  - null
-  - 'DV'
-  - null
-  'passes': true
diff --git a/regex_patterns/Non Retail HDR Groups (1).yml b/regex_patterns/Non Retail HDR Groups (1).yml
deleted file mode 100644
index b863cf9..0000000
--- a/regex_patterns/Non Retail HDR Groups (1).yml	
+++ /dev/null
@@ -1,28 +0,0 @@
-'description': 'Matches groups that produce non retail HDR.'
-'name': 'Non Retail HDR Groups'
-'pattern': '(?<=^|[\s.-])VECTOR|BiTOR|DepraveD|SasukeducK|tarunk9c|jennaortegaUHD|VisionXpert|Flights\b'
-'tags':
-- 'Release Group'
-- 'HDR'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Longlegs 2024 2160p BluRay REMUX DTS-HD MA 5 1 DV HDR H 265-SasukeducK'
-  'lastRun': '2025-01-11T05:45:15.414689'
-  'matchSpan':
-    'end': 70
-    'start': 60
-  'matchedContent': 'SasukeducK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Blade Runner 2049 2017 2160p REMUX HEVC DV HDR10+ TrueHD 7.1 Atmos-jennaortegaUHD'
-  'lastRun': '2025-01-11T05:45:15.414689'
-  'matchSpan':
-    'end': 81
-    'start': 67
-  'matchedContent': 'jennaortegaUHD'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Non Retail HDR Groups.yml b/regex_patterns/Non Retail HDR Groups.yml
index 9b099e7..d05b417 100644
--- a/regex_patterns/Non Retail HDR Groups.yml	
+++ b/regex_patterns/Non Retail HDR Groups.yml	
@@ -4,7 +4,7 @@ description: Matches groups that produce non retail HDR.
 tags:
 - Release Group
 - HDR
-- Unwanted
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/NoobSubs.yml b/regex_patterns/NoobSubs.yml
deleted file mode 100644
index 4794fba..0000000
--- a/regex_patterns/NoobSubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'NoobSubs'
-pattern: \b(N[eo][wo]b[ ._-]?Subs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NorTekst.yml b/regex_patterns/NorTekst.yml
deleted file mode 100644
index e59a15c..0000000
--- a/regex_patterns/NorTekst.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: NorTekst
-pattern: (?<=^|[\s.-])NorTekst\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Not 3.0ch.yml b/regex_patterns/Not 3.0ch.yml
deleted file mode 100644
index e38acba..0000000
--- a/regex_patterns/Not 3.0ch.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Not 3.0ch'
-pattern: '[^0-9]3[ .]0\\b'
-description: ''
-tags:
-- Release Group
-- Audio
-tests: []
diff --git a/regex_patterns/Not 4.0ch.yml b/regex_patterns/Not 4.0ch.yml
deleted file mode 100644
index 5d188ed..0000000
--- a/regex_patterns/Not 4.0ch.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Not 4.0ch'
-pattern: '[^0-9]4[ .]0\\b'
-description: ''
-tags:
-- Release Group
-- Audio
-tests: []
diff --git a/regex_patterns/Not DV HDR10.yml b/regex_patterns/Not DV HDR10.yml
deleted file mode 100644
index 20742a7..0000000
--- a/regex_patterns/Not DV HDR10.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Not DV HDR10'
-pattern: '^(?=.*\\b(DV|DoVi|Dolby[ .]?V(ision)?)\\b)(?=.*\\b(HDR(10)?(P(lus)?)?)\\b)'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Not DV HDR10Plus.yml b/regex_patterns/Not DV HDR10Plus.yml
deleted file mode 100644
index 08a06bf..0000000
--- a/regex_patterns/Not DV HDR10Plus.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Not DV HDR10Plus'
-pattern: '^(?=.*\\b(DV|DoVi|Dolby[ .]?V(ision)?)\\b)(?=.*\\b((HDR10(?=(P(lus)?)\\b|\\+))))'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Not DV HLG.yml b/regex_patterns/Not DV HLG.yml
deleted file mode 100644
index 46ab1c7..0000000
--- a/regex_patterns/Not DV HLG.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Not DV HLG'
-pattern: '\b(DV[ .]HLG)\b'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Not DV SDR.yml b/regex_patterns/Not DV SDR.yml
deleted file mode 100644
index dfd59d4..0000000
--- a/regex_patterns/Not DV SDR.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Not DV SDR'
-pattern: '\b(DV[ .]SDR)\b'
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Not DV.yml b/regex_patterns/Not DV.yml
deleted file mode 100644
index a0bdb65..0000000
--- a/regex_patterns/Not DV.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not DV
-pattern: \b(dv|dovi|dolby[ .]?v(ision)?)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not HDR.yml b/regex_patterns/Not HDR.yml
deleted file mode 100644
index a384bb5..0000000
--- a/regex_patterns/Not HDR.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not HDR
-pattern: \bHDR(\b|\d)
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not HDR10+.yml b/regex_patterns/Not HDR10+.yml
deleted file mode 100644
index c2a2b88..0000000
--- a/regex_patterns/Not HDR10+.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not HDR10+
-pattern: \bHDR10(\+|P(lus)?\b)
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not HDR10.yml b/regex_patterns/Not HDR10.yml
deleted file mode 100644
index fb4d238..0000000
--- a/regex_patterns/Not HDR10.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not HDR10
-pattern: \bHDR10(?!\+|Plus)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not HLG.yml b/regex_patterns/Not HLG.yml
deleted file mode 100644
index 6565af3..0000000
--- a/regex_patterns/Not HLG.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not HLG
-pattern: \b(HLG)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not High Channel Count.yml b/regex_patterns/Not High Channel Count.yml
deleted file mode 100644
index ca8fe85..0000000
--- a/regex_patterns/Not High Channel Count.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Not High Channel Count'
-pattern: '[^0-9][5-9][ .][0-1]\\b'
-description: ''
-tags:
-- Release Group
-- Audio
-tests: []
diff --git a/regex_patterns/Not Hulu.yml b/regex_patterns/Not Hulu.yml
deleted file mode 100644
index 8197721..0000000
--- a/regex_patterns/Not Hulu.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not Hulu
-pattern: \b(hulu)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not Mono.yml b/regex_patterns/Not Mono.yml
deleted file mode 100644
index 307e457..0000000
--- a/regex_patterns/Not Mono.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Not Mono'
-pattern: '[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]'
-description: ''
-tags:
-- Release Group
-- Audio
-tests: []
diff --git a/regex_patterns/Not PQ.yml b/regex_patterns/Not PQ.yml
deleted file mode 100644
index 9d7eed6..0000000
--- a/regex_patterns/Not PQ.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Not PQ'
-pattern: '\\b(PQ)\\b'
-description: ''
-tags:
-- Enhancement
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Not RlsGrp.yml b/regex_patterns/Not RlsGrp.yml
deleted file mode 100644
index d70832a..0000000
--- a/regex_patterns/Not RlsGrp.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not RlsGrp
-pattern: \b(Flights)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not SDR.yml b/regex_patterns/Not SDR.yml
deleted file mode 100644
index a35ed06..0000000
--- a/regex_patterns/Not SDR.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Not SDR
-pattern: \bSDR(\b|\d)
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Not-Vodes.yml b/regex_patterns/Not-Vodes.yml
deleted file mode 100644
index 5c3a7dc..0000000
--- a/regex_patterns/Not-Vodes.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Not-Vodes'
-pattern: \[Not-Vodes\]|-Not-Vodes\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Now Rename.yml b/regex_patterns/Now Rename.yml
index 0909da1..7a46ca7 100644
--- a/regex_patterns/Now Rename.yml	
+++ b/regex_patterns/Now Rename.yml	
@@ -1,10 +1,10 @@
-'description': 'Now (formerly Now TV and often stylised as NOW) is a subscription
-  over-the-top streaming television service launched in the United Kingdom in 2012.
-  It is operated by Sky Group in Europe, and Xfinity in the US; both owned by the
-  American media conglomerate Comcast.'
-'name': 'Now Rename'
-'pattern': '\[(NOW)\b|\b(NOW)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+name: Now Rename
+pattern: \[(NOW)\b|\b(NOW)\]
+description: Now (formerly Now TV and often stylised as NOW) is a subscription over-the-top
+  streaming television service launched in the United Kingdom in 2012. It is operated
+  by Sky Group in Europe, and Xfinity in the US; both owned by the American media
+  conglomerate Comcast.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Now.yml b/regex_patterns/Now.yml
index e13949f..cf8581d 100644
--- a/regex_patterns/Now.yml
+++ b/regex_patterns/Now.yml
@@ -1,10 +1,10 @@
-'description': 'Now (formerly Now TV and often stylised as NOW) is a subscription
-  over-the-top streaming television service launched in the United Kingdom in 2012.
-  It is operated by Sky Group in Europe, and Xfinity in the US; both owned by the
-  American media conglomerate Comcast.'
-'name': 'Now'
-'pattern': '\b(now)\b[ ._-]web[ ._-]?(dl|rip)?\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+name: Now
+pattern: \b(now)\b[ ._-]web[ ._-]?(dl|rip)?\b
+description: Now (formerly Now TV and often stylised as NOW) is a subscription over-the-top
+  streaming television service launched in the United Kingdom in 2012. It is operated
+  by Sky Group in Europe, and Xfinity in the US; both owned by the American media
+  conglomerate Comcast.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Noyr.yml b/regex_patterns/Noyr.yml
deleted file mode 100644
index 237e301..0000000
--- a/regex_patterns/Noyr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Noyr
-pattern: \b(Noyr)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/NyHD (1).yml b/regex_patterns/NyHD (1).yml
deleted file mode 100644
index 8c8d7b3..0000000
--- a/regex_patterns/NyHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'NyHD'
-'pattern': '(?<=^|[\s.-])NyHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/NyHD.yml b/regex_patterns/NyHD.yml
index e6d2e65..a424bf9 100644
--- a/regex_patterns/NyHD.yml
+++ b/regex_patterns/NyHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])NyHD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Nyanpasu.yml b/regex_patterns/Nyanpasu.yml
deleted file mode 100644
index 6d1b390..0000000
--- a/regex_patterns/Nyanpasu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Nyanpasu'
-pattern: \b(Nyanpasu)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/OEPlus.yml b/regex_patterns/OEPlus.yml
index e344913..fb4fcc9 100644
--- a/regex_patterns/OEPlus.yml
+++ b/regex_patterns/OEPlus.yml
@@ -1,7 +1,7 @@
-'description': 'Banned for Automated Encodes'
-'name': 'OEPlus'
-'pattern': '(?<=^|[\s.-])OEPlus\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: OEPlus
+pattern: (?<=^|[\s.-])OEPlus\b
+description: Banned for Automated Encodes
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/OFT.yml b/regex_patterns/OFT.yml
deleted file mode 100644
index c22a302..0000000
--- a/regex_patterns/OFT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: OFT
-pattern: ^(OFT)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/ORiGEN (1).yml b/regex_patterns/ORiGEN (1).yml
deleted file mode 100644
index 94bfedd..0000000
--- a/regex_patterns/ORiGEN (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ORiGEN'
-'pattern': '(?<=^|[\s.-])ORiGEN\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ORiGEN.yml b/regex_patterns/ORiGEN.yml
index 746fa4b..25867c9 100644
--- a/regex_patterns/ORiGEN.yml
+++ b/regex_patterns/ORiGEN.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ORiGEN\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/OZR (1).yml b/regex_patterns/OZR (1).yml
deleted file mode 100644
index 89f9bf0..0000000
--- a/regex_patterns/OZR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'OZR'
-'pattern': '(?<=^|[\s.-])OZR\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/OZR.yml b/regex_patterns/OZR.yml
index 624875e..302c1d4 100644
--- a/regex_patterns/OZR.yml
+++ b/regex_patterns/OZR.yml
@@ -1,6 +1,7 @@
 name: OZR
-pattern: \b(OZR)\b
+pattern: (?<=^|[\s.-])OZR\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Ohys-Raws.yml b/regex_patterns/Ohys-Raws.yml
deleted file mode 100644
index 94c9230..0000000
--- a/regex_patterns/Ohys-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Ohys-Raws'
-pattern: Ohys[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Okay-Subs (1).yml b/regex_patterns/Okay-Subs (1).yml
deleted file mode 100644
index 93d6d65..0000000
--- a/regex_patterns/Okay-Subs (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Okay-Subs'
-'pattern': '(?<=^|[\s.-])Okay-Subs\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Okay-Subs.yml b/regex_patterns/Okay-Subs.yml
index f05a971..fd9e94e 100644
--- a/regex_patterns/Okay-Subs.yml
+++ b/regex_patterns/Okay-Subs.yml
@@ -1,6 +1,7 @@
-name: 'Okay-Subs'
-pattern: \b(Okay-Subs)\b
+name: Okay-Subs
+pattern: (?<=^|[\s.-])Okay-Subs\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/OldCastle.yml b/regex_patterns/OldCastle.yml
deleted file mode 100644
index 24a4541..0000000
--- a/regex_patterns/OldCastle.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'OldCastle'
-pattern: \b(OldCastle)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/OnDeed.yml b/regex_patterns/OnDeed.yml
deleted file mode 100644
index 227755e..0000000
--- a/regex_patterns/OnDeed.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'OnDeed'
-pattern: \b(OnDeed)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Open Matte (1).yml b/regex_patterns/Open Matte (1).yml
deleted file mode 100644
index e0ecb12..0000000
--- a/regex_patterns/Open Matte (1).yml	
+++ /dev/null
@@ -1,42 +0,0 @@
-'description': 'Matches releases with restored widescreen aspect ratio labelled as`Open
-  Matte`'
-'name': 'Open Matte'
-'pattern': '\b(open.?matte)\b'
-'tags':
-- 'Aspect Ratio'
-- 'Enhancement'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Zombieland.2009.Open.Matte.1080p.WEB-DL.DD+5.1.H.264-spartanec163.mkv'
-  'lastRun': '2025-02-25T22:03:36.971220'
-  'matchSpan':
-    'end': 26
-    'start': 16
-  'matchedContent': 'Open.Matte'
-  'matchedGroups':
-  - 'Open.Matte'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Watchmen 2009 Director''s Cut Open Matte 1080p WEB-DL DDP 5.1 H.264'
-  'lastRun': '2025-02-25T22:03:36.971220'
-  'matchSpan':
-    'end': 39
-    'start': 29
-  'matchedContent': 'Open Matte'
-  'matchedGroups':
-  - 'Open Matte'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Tron Legacy 2010 Open Matte Upscale 2160p BluRay DV HDR-X DTS-HD MA 7
-    1 x265-BiTOR'
-  'lastRun': '2025-02-25T22:03:36.971220'
-  'matchSpan':
-    'end': 27
-    'start': 17
-  'matchedContent': 'Open Matte'
-  'matchedGroups':
-  - 'Open Matte'
-  'passes': true
diff --git a/regex_patterns/Orphan.yml b/regex_patterns/Orphan.yml
deleted file mode 100644
index 33073b8..0000000
--- a/regex_patterns/Orphan.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Orphan'
-pattern: \[Orphan\]|-Orphan\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/P0W4HD (1).yml b/regex_patterns/P0W4HD (1).yml
deleted file mode 100644
index 2451b7d..0000000
--- a/regex_patterns/P0W4HD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'P0W4HD'
-'pattern': '(?<=^|[\s.-])P0W4HD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/P0W4HD.yml b/regex_patterns/P0W4HD.yml
index 2161e6a..01c13f5 100644
--- a/regex_patterns/P0W4HD.yml
+++ b/regex_patterns/P0W4HD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])P0W4HD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/PAS.yml b/regex_patterns/PAS.yml
deleted file mode 100644
index 1fb325b..0000000
--- a/regex_patterns/PAS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'PAS'
-pattern: \b(PAS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/PATOMiEL.yml b/regex_patterns/PATOMiEL.yml
deleted file mode 100644
index 846d4d5..0000000
--- a/regex_patterns/PATOMiEL.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: PATOMiEL
-pattern: ^(PATOMiEL)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/PCM (1).yml b/regex_patterns/PCM (1).yml
deleted file mode 100644
index 152c607..0000000
--- a/regex_patterns/PCM (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': ''
-'name': 'PCM'
-'pattern': '\b(l?)PCM(\b|\d)'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/PCM.yml b/regex_patterns/PCM.yml
index 0340d00..d5a3d39 100644
--- a/regex_patterns/PCM.yml
+++ b/regex_patterns/PCM.yml
@@ -1,5 +1,6 @@
 name: PCM
 pattern: \b(l?)PCM(\b|\d)
 description: ''
-tags: []
+tags:
+- Audio
 tests: []
diff --git a/regex_patterns/PHOCiS (1).yml b/regex_patterns/PHOCiS (1).yml
deleted file mode 100644
index fa45c98..0000000
--- a/regex_patterns/PHOCiS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'PHOCiS'
-'pattern': '(?<=^|[\s.-])PHOCiS\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
diff --git a/regex_patterns/PHOCiS.yml b/regex_patterns/PHOCiS.yml
index 2c91a80..cf99860 100644
--- a/regex_patterns/PHOCiS.yml
+++ b/regex_patterns/PHOCiS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])PHOCiS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- HEVC
+tests: []
diff --git a/regex_patterns/PHOENiX (1).yml b/regex_patterns/PHOENiX (1).yml
deleted file mode 100644
index ca63069..0000000
--- a/regex_patterns/PHOENiX (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': 'Matches "PHOENiX" when preceded by whitespace, a hyphen or dot'
-'name': 'PHOENiX'
-'pattern': '(?<=^|[\s.-])PHOENiX\b'
-'tags':
-- 'Release Group'
-'tests': []
diff --git a/regex_patterns/PHOENiX.yml b/regex_patterns/PHOENiX.yml
index 029b446..aac7abe 100644
--- a/regex_patterns/PHOENiX.yml
+++ b/regex_patterns/PHOENiX.yml
@@ -1,6 +1,6 @@
 name: PHOENiX
-pattern: ^(PHOENiX)$
-description: ''
+pattern: (?<=^|[\s.-])PHOENiX\b
+description: Matches "PHOENiX" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
 tests: []
diff --git a/regex_patterns/PP.yml b/regex_patterns/PP.yml
index e699cc4..d6f89c9 100644
--- a/regex_patterns/PP.yml
+++ b/regex_patterns/PP.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'PP'
-'pattern': '(?<=^|[\s.-])PP\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: PP
+pattern: (?<=^|[\s.-])PP\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/PQ (1).yml b/regex_patterns/PQ (1).yml
deleted file mode 100644
index f7c20ea..0000000
--- a/regex_patterns/PQ (1).yml	
+++ /dev/null
@@ -1,8 +0,0 @@
-'description': 'This regex matches a `PQ` generalisation. This is a basic HDR Format.'
-'name': 'PQ'
-'pattern': '\b(PQ|PQ10)\b'
-'tags':
-- 'Enhancement'
-- 'Colour Grade'
-- 'HDR'
-'tests': []
diff --git a/regex_patterns/PQ.yml b/regex_patterns/PQ.yml
index fda86ff..d36e001 100644
--- a/regex_patterns/PQ.yml
+++ b/regex_patterns/PQ.yml
@@ -1,5 +1,8 @@
 name: PQ
-pattern: \b(PQ)\b
-description: ''
-tags: []
+pattern: \b(PQ|PQ10)\b
+description: This regex matches a `PQ` generalisation. This is a basic HDR Format.
+tags:
+- Enhancement
+- Colour Grade
+- HDR
 tests: []
diff --git a/regex_patterns/PRODJi.yml b/regex_patterns/PRODJi.yml
deleted file mode 100644
index 4aef755..0000000
--- a/regex_patterns/PRODJi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: PRODJi
-pattern: ^(PRODJi)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/PRiSTiNE.yml b/regex_patterns/PRiSTiNE.yml
deleted file mode 100644
index cbbb18b..0000000
--- a/regex_patterns/PRiSTiNE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: PRiSTiNE
-pattern: (?<=^|[\s.-])PRiSTiNE\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/PSA.yml b/regex_patterns/PSA.yml
deleted file mode 100644
index 00c8c15..0000000
--- a/regex_patterns/PSA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: PSA
-pattern: ^(PSA)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/PSiG.yml b/regex_patterns/PSiG.yml
deleted file mode 100644
index 91fa2c8..0000000
--- a/regex_patterns/PSiG.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: PSiG
-pattern: ^(PSiG)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/PTH (1).yml b/regex_patterns/PTH (1).yml
deleted file mode 100644
index b6ddf32..0000000
--- a/regex_patterns/PTH (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'PTH'
-'pattern': '(?<=^|[\s.-])PTH\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/PTH.yml b/regex_patterns/PTH.yml
index b83a645..99e37dc 100644
--- a/regex_patterns/PTH.yml
+++ b/regex_patterns/PTH.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])PTH\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/PTNK.yml b/regex_patterns/PTNK.yml
deleted file mode 100644
index 98f6b30..0000000
--- a/regex_patterns/PTNK.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: PTNK
-pattern: ^(PTNK)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/PTP.yml b/regex_patterns/PTP.yml
index ba50006..15dacc3 100644
--- a/regex_patterns/PTP.yml
+++ b/regex_patterns/PTP.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'PTP'
-'pattern': '(?<=^|[\s.-])PTP\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: PTP
+pattern: (?<=^|[\s.-])PTP\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/PTer (1).yml b/regex_patterns/PTer (1).yml
deleted file mode 100644
index b2989cb..0000000
--- a/regex_patterns/PTer (1).yml	
+++ /dev/null
@@ -1,25 +0,0 @@
-'description': ''
-'name': 'PTer'
-'pattern': '(?<=^|[\s.-])PTer\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': "\u7BB1\u7537.Hako.otoko.2024.1080p.NF.WEB-DL.x264.DDP5.1-PTerWEB"
-  'lastRun': '2025-02-09T03:36:13.163388'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Ying.Hung.Boon.Sik.1986.REPACK.1080p.UHD.BluRay.DD+7.1.DoVi.HDR10.x265-PTer'
-  'lastRun': '2025-02-09T03:36:13.163388'
-  'matchSpan':
-    'end': 75
-    'start': 71
-  'matchedContent': 'PTer'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/PTer.yml b/regex_patterns/PTer.yml
index 9a9c8d3..32bcec9 100644
--- a/regex_patterns/PTer.yml
+++ b/regex_patterns/PTer.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])PTer\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests:
 - expected: false
   id: 1
diff --git a/regex_patterns/PTerWEB (1).yml b/regex_patterns/PTerWEB (1).yml
deleted file mode 100644
index a6729e4..0000000
--- a/regex_patterns/PTerWEB (1).yml	
+++ /dev/null
@@ -1,25 +0,0 @@
-'description': ''
-'name': 'PTerWEB'
-'pattern': '(?<=^|[\s.-])PTerWEB\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': "\u7BB1\u7537.Hako.otoko.2024.1080p.NF.WEB-DL.x264.DDP5.1-PTerWEB"
-  'lastRun': '2025-02-09T03:36:19.441066'
-  'matchSpan':
-    'end': 54
-    'start': 47
-  'matchedContent': 'PTerWEB'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Ying.Hung.Boon.Sik.1986.REPACK.1080p.UHD.BluRay.DD+7.1.DoVi.HDR10.x265-PTer'
-  'lastRun': '2025-02-09T03:36:19.441066'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/PTerWEB.yml b/regex_patterns/PTerWEB.yml
index 06355aa..a8007a1 100644
--- a/regex_patterns/PTerWEB.yml
+++ b/regex_patterns/PTerWEB.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])PTerWEB\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Pahe.yml b/regex_patterns/Pahe.yml
deleted file mode 100644
index f628b2f..0000000
--- a/regex_patterns/Pahe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Pahe
-pattern: Pahe(\.(ph|in))?\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Pandoratv-Raws.yml b/regex_patterns/Pandoratv-Raws.yml
deleted file mode 100644
index ac83199..0000000
--- a/regex_patterns/Pandoratv-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Pandoratv-Raws'
-pattern: Pandoratv[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Pantsu.yml b/regex_patterns/Pantsu.yml
deleted file mode 100644
index 12498cc..0000000
--- a/regex_patterns/Pantsu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Pantsu'
-pattern: \[Pantsu\]|-Pantsu\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Pao.yml b/regex_patterns/Pao.yml
deleted file mode 100644
index 90dad1d..0000000
--- a/regex_patterns/Pao.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Pao'
-pattern: \[Pao\]|-Pao\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Paramount+ (1).yml b/regex_patterns/Paramount+ (1).yml
deleted file mode 100644
index 9fde239..0000000
--- a/regex_patterns/Paramount+ (1).yml	
+++ /dev/null
@@ -1,43 +0,0 @@
-'description': 'Paramount+ is an American subscription video on-demand over-the-top
-  streaming service owned that offers content primarily from the libraries of CBS
-  Media Ventures, CBS Studios, Paramount Media Networks and Paramount Pictures, while
-  also including original series and films, live streaming sports coverage, and in
-  the United States, live streaming of local CBS broadcast stations. '
-'name': 'Paramount+'
-'pattern': '\b(PMTP|Paramount Plus)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Landman S01E02 Dreamers and Losers 2160p PMTP WEB-DL DDP5 1 H 265-STC'
-  'lastRun': '2024-12-06T05:10:12.208630'
-  'matchSpan':
-    'end': 45
-    'start': 41
-  'matchedContent': 'PMTP'
-  'matchedGroups':
-  - 'PMTP'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Star Trek Lower Decks S05E03 The Best Exotic Nanite Hotel 1080p PMTP WEB-DL
-    DDP5 1 H 264-STC'
-  'lastRun': '2024-12-06T05:10:12.208630'
-  'matchSpan':
-    'end': 68
-    'start': 64
-  'matchedContent': 'PMTP'
-  'matchedGroups':
-  - 'PMTP'
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Gladiator 2000 Paramount Reissue Extended Cut Remastered 1080p BluRay
-    AVC DTS-HD MA 5.1 REMUX-FraMeSToR'
-  'lastRun': '2024-12-06T05:10:12.208630'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Paramount+.yml b/regex_patterns/Paramount+.yml
index 7d537ec..9d021bd 100644
--- a/regex_patterns/Paramount+.yml
+++ b/regex_patterns/Paramount+.yml
@@ -1,5 +1,5 @@
 name: Paramount+
-pattern: \b(pmtp|Paramount Plus)\b
+pattern: \b(PMTP|Paramount Plus)\b
 description: 'Paramount+ is an American subscription video on-demand over-the-top
   streaming service owned that offers content primarily from the libraries of CBS
   Media Ventures, CBS Studios, Paramount Media Networks and Paramount Pictures, while
@@ -8,7 +8,6 @@ description: 'Paramount+ is an American subscription video on-demand over-the-to
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/Peacock TV (1).yml b/regex_patterns/Peacock TV (1).yml
deleted file mode 100644
index 846b417..0000000
--- a/regex_patterns/Peacock TV (1).yml	
+++ /dev/null
@@ -1,86 +0,0 @@
-'description': 'Peacock is an American over-the-top subscription streaming service
-  owned and operated by Peacock TV, LLC, a subsidiary of NBCUniversal Media Group.
-  The service primarily features series and film content from NBCUniversal studios
-  and other third-party content providers (such as WWE and Hallmark Channel).'
-'name': 'Peacock TV'
-'pattern': '\b(?:(?:1080|2160|720)p(?:[ .]+)PCOK|(?:Peacock(?:[ .]+)Web-?DL|Web-?DL(?:[
-  .]+)Peacock))\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Day of the Jackal S01E05 1080p PCOK WEB-DL DDP5 1 H 264-STC'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 39
-    'start': 29
-  'matchedContent': '1080p PCOK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Fight Night - The Million Dollar Heist (2024) S01E01 (2160p PCOK WEB-DL
-    H265 SDR DDP 5.1 English - HONE)'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 64
-    'start': 54
-  'matchedContent': '2160p PCOK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Halloween Kills 2021 1080p Peacock WebDL H264 AC3 Will1869'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 40
-    'start': 27
-  'matchedContent': 'Peacock WebDL'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Peacock.S01.1080p.AMZN.WEB-DL.DDP2.0.H.264-Cinefeel'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'Peacock.S02.1080p.iP.WEB-DL.AAC2.0.H.264-RNG'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'Banana Fish S01E16 Lo The Poor Peacock WEB h264-PLUTONiUM'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': 'Kingsman The Secret Service 2014 1080p PCOK WEB-DL DDP 5 1 H 264-PiRaTeS'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 43
-    'start': 33
-  'matchedContent': '1080p PCOK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Kingsman.The.Secret.Service.2014.1080p.PCOK.WEB-DL.DDP.5.1.H.264-PiRaTeS'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 43
-    'start': 33
-  'matchedContent': '1080p.PCOK'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Peacock TV Rename.yml b/regex_patterns/Peacock TV Rename.yml
index 79f2799..a9193e0 100644
--- a/regex_patterns/Peacock TV Rename.yml	
+++ b/regex_patterns/Peacock TV Rename.yml	
@@ -1,85 +1,85 @@
-'description': 'Peacock is an American over-the-top subscription streaming service
-  owned and operated by Peacock TV, LLC, a subsidiary of NBCUniversal Media Group.
-  The service primarily features series and film content from NBCUniversal studios
-  and other third-party content providers (such as WWE and Hallmark Channel).'
-'name': 'Peacock TV Rename'
-'pattern': '\[(PCOK)\b|\b(PCOK)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Day of the Jackal S01E05 1080p PCOK WEB-DL DDP5 1 H 264-STC'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 39
-    'start': 29
-  'matchedContent': '1080p PCOK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Fight Night - The Million Dollar Heist (2024) S01E01 (2160p PCOK WEB-DL
-    H265 SDR DDP 5.1 English - HONE)'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 64
-    'start': 54
-  'matchedContent': '2160p PCOK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Halloween Kills 2021 1080p Peacock WebDL H264 AC3 Will1869'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 40
-    'start': 27
-  'matchedContent': 'Peacock WebDL'
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 4
-  'input': 'Peacock.S01.1080p.AMZN.WEB-DL.DDP2.0.H.264-Cinefeel'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'Peacock.S02.1080p.iP.WEB-DL.AAC2.0.H.264-RNG'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'Banana Fish S01E16 Lo The Poor Peacock WEB h264-PLUTONiUM'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': 'Kingsman The Secret Service 2014 1080p PCOK WEB-DL DDP 5 1 H 264-PiRaTeS'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 43
-    'start': 33
-  'matchedContent': '1080p PCOK'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Kingsman.The.Secret.Service.2014.1080p.PCOK.WEB-DL.DDP.5.1.H.264-PiRaTeS'
-  'lastRun': '2025-03-25T16:16:33.336288'
-  'matchSpan':
-    'end': 43
-    'start': 33
-  'matchedContent': '1080p.PCOK'
-  'matchedGroups': []
-  'passes': true
+name: Peacock TV Rename
+pattern: \[(PCOK)\b|\b(PCOK)\]
+description: Peacock is an American over-the-top subscription streaming service owned
+  and operated by Peacock TV, LLC, a subsidiary of NBCUniversal Media Group. The service
+  primarily features series and film content from NBCUniversal studios and other third-party
+  content providers (such as WWE and Hallmark Channel).
+tags:
+- Streaming Service
+- WEB-DL
+tests:
+- expected: true
+  id: 1
+  input: The Day of the Jackal S01E05 1080p PCOK WEB-DL DDP5 1 H 264-STC
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 39
+    start: 29
+  matchedContent: 1080p PCOK
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 2
+  input: Fight Night - The Million Dollar Heist (2024) S01E01 (2160p PCOK WEB-DL H265
+    SDR DDP 5.1 English - HONE)
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 64
+    start: 54
+  matchedContent: 2160p PCOK
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 3
+  input: Halloween Kills 2021 1080p Peacock WebDL H264 AC3 Will1869
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 40
+    start: 27
+  matchedContent: Peacock WebDL
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 4
+  input: Peacock.S01.1080p.AMZN.WEB-DL.DDP2.0.H.264-Cinefeel
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 5
+  input: Peacock.S02.1080p.iP.WEB-DL.AAC2.0.H.264-RNG
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 6
+  input: Banana Fish S01E16 Lo The Poor Peacock WEB h264-PLUTONiUM
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 7
+  input: Kingsman The Secret Service 2014 1080p PCOK WEB-DL DDP 5 1 H 264-PiRaTeS
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 43
+    start: 33
+  matchedContent: 1080p PCOK
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 8
+  input: Kingsman.The.Secret.Service.2014.1080p.PCOK.WEB-DL.DDP.5.1.H.264-PiRaTeS
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 43
+    start: 33
+  matchedContent: 1080p.PCOK
+  matchedGroups: []
+  passes: true
diff --git a/regex_patterns/Peacock TV.yml b/regex_patterns/Peacock TV.yml
index 749e06e..16abe0e 100644
--- a/regex_patterns/Peacock TV.yml	
+++ b/regex_patterns/Peacock TV.yml	
@@ -1,5 +1,6 @@
 name: Peacock TV
-pattern: \b(?:(?:1080|2160|720)p\s+PCOK|(?:Peacock\s+Web-?DL|Web-?DL\s+Peacock))\b
+pattern: \b(?:(?:1080|2160|720)p(?:[ .]+)PCOK|(?:Peacock(?:[ .]+)Web-?DL|Web-?DL(?:[
+  .]+)Peacock))\b
 description: Peacock is an American over-the-top subscription streaming service owned
   and operated by Peacock TV, LLC, a subsidiary of NBCUniversal Media Group. The service
   primarily features series and film content from NBCUniversal studios and other third-party
@@ -7,12 +8,11 @@ description: Peacock is an American over-the-top subscription streaming service
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
   input: The Day of the Jackal S01E05 1080p PCOK WEB-DL DDP5 1 H 264-STC
-  lastRun: '2024-12-06T01:57:36.984387'
+  lastRun: '2025-03-25T16:16:33.336288'
   matchSpan:
     end: 39
     start: 29
@@ -23,7 +23,7 @@ tests:
   id: 2
   input: Fight Night - The Million Dollar Heist (2024) S01E01 (2160p PCOK WEB-DL H265
     SDR DDP 5.1 English - HONE)
-  lastRun: '2024-12-06T01:57:36.984387'
+  lastRun: '2025-03-25T16:16:33.336288'
   matchSpan:
     end: 64
     start: 54
@@ -33,7 +33,7 @@ tests:
 - expected: true
   id: 3
   input: Halloween Kills 2021 1080p Peacock WebDL H264 AC3 Will1869
-  lastRun: '2024-12-06T01:57:36.984387'
+  lastRun: '2025-03-25T16:16:33.336288'
   matchSpan:
     end: 40
     start: 27
@@ -43,7 +43,7 @@ tests:
 - expected: false
   id: 4
   input: Peacock.S01.1080p.AMZN.WEB-DL.DDP2.0.H.264-Cinefeel
-  lastRun: '2024-12-06T01:57:36.984387'
+  lastRun: '2025-03-25T16:16:33.336288'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -51,7 +51,7 @@ tests:
 - expected: false
   id: 5
   input: Peacock.S02.1080p.iP.WEB-DL.AAC2.0.H.264-RNG
-  lastRun: '2024-12-06T01:57:36.984387'
+  lastRun: '2025-03-25T16:16:33.336288'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -59,8 +59,28 @@ tests:
 - expected: false
   id: 6
   input: Banana Fish S01E16 Lo The Poor Peacock WEB h264-PLUTONiUM
-  lastRun: '2024-12-06T01:57:36.984387'
+  lastRun: '2025-03-25T16:16:33.336288'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
   passes: true
+- expected: true
+  id: 7
+  input: Kingsman The Secret Service 2014 1080p PCOK WEB-DL DDP 5 1 H 264-PiRaTeS
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 43
+    start: 33
+  matchedContent: 1080p PCOK
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 8
+  input: Kingsman.The.Secret.Service.2014.1080p.PCOK.WEB-DL.DDP.5.1.H.264-PiRaTeS
+  lastRun: '2025-03-25T16:16:33.336288'
+  matchSpan:
+    end: 43
+    start: 33
+  matchedContent: 1080p.PCOK
+  matchedGroups: []
+  passes: true
diff --git a/regex_patterns/Penumbra (1).yml b/regex_patterns/Penumbra (1).yml
deleted file mode 100644
index 817f540..0000000
--- a/regex_patterns/Penumbra (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Penumbra'
-'pattern': '(?<=^|[\s.-])Penumbra\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Penumbra.yml b/regex_patterns/Penumbra.yml
index 97d2dd9..55a7172 100644
--- a/regex_patterns/Penumbra.yml
+++ b/regex_patterns/Penumbra.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Penumbra\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/PiRaTeS (1).yml b/regex_patterns/PiRaTeS (1).yml
deleted file mode 100644
index 6033f5f..0000000
--- a/regex_patterns/PiRaTeS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Mislabeling WEB-DLs as WEBRips'
-'name': 'PiRaTeS'
-'pattern': '(?<=^|[\s.-])PiRaTeS\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/PiRaTeS.yml b/regex_patterns/PiRaTeS.yml
index e924a9c..5e56138 100644
--- a/regex_patterns/PiRaTeS.yml
+++ b/regex_patterns/PiRaTeS.yml
@@ -1,6 +1,7 @@
 name: PiRaTeS
-pattern: ^(PiRaTeS)$
-description: ''
+pattern: (?<=^|[\s.-])PiRaTeS\b
+description: Banned for Mislabeling WEB-DLs as WEBRips
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/Pixel.yml b/regex_patterns/Pixel.yml
deleted file mode 100644
index 70697ae..0000000
--- a/regex_patterns/Pixel.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Pixel'
-pattern: \[Pixel\]|-Pixel\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Pizza.yml b/regex_patterns/Pizza.yml
deleted file mode 100644
index 1ca7b94..0000000
--- a/regex_patterns/Pizza.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Pizza'
-pattern: \[Pizza\]|-Pizza\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Plex-Friendly.yml b/regex_patterns/Plex-Friendly.yml
deleted file mode 100644
index f2024bf..0000000
--- a/regex_patterns/Plex-Friendly.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Plex Friendly'
-pattern: \b(Plex[ .-]?Friendly)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/PmP (1).yml b/regex_patterns/PmP (1).yml
deleted file mode 100644
index ebf7727..0000000
--- a/regex_patterns/PmP (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'PmP'
-'pattern': '(?<=^|[\s.-])PmP\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/PmP.yml b/regex_patterns/PmP.yml
index 5b07fc2..0e50774 100644
--- a/regex_patterns/PmP.yml
+++ b/regex_patterns/PmP.yml
@@ -1,6 +1,7 @@
-name: 'PmP'
-pattern: ^(PmP)$
+name: PmP
+pattern: (?<=^|[\s.-])PmP\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/Pn8.yml b/regex_patterns/Pn8.yml
deleted file mode 100644
index 3d0dd89..0000000
--- a/regex_patterns/Pn8.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Pn8'
-pattern: \b(Pn8)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/PnPSubs.yml b/regex_patterns/PnPSubs.yml
deleted file mode 100644
index 47e19f8..0000000
--- a/regex_patterns/PnPSubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'PnPSubs'
-pattern: \b(PnPSubs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Polarwindz.yml b/regex_patterns/Polarwindz.yml
deleted file mode 100644
index fe185de..0000000
--- a/regex_patterns/Polarwindz.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Polarwindz'
-pattern: \b(Polarwindz)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Pookie (1).yml b/regex_patterns/Pookie (1).yml
deleted file mode 100644
index 589adfd..0000000
--- a/regex_patterns/Pookie (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Pookie'
-'pattern': '(?<=^|[\s.-])Pookie\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Pookie.yml b/regex_patterns/Pookie.yml
index 27bee7a..df27d29 100644
--- a/regex_patterns/Pookie.yml
+++ b/regex_patterns/Pookie.yml
@@ -1,6 +1,7 @@
-name: 'Pookie'
-pattern: \b(Pookie)\b
+name: Pookie
+pattern: (?<=^|[\s.-])Pookie\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Positive (1).yml b/regex_patterns/Positive (1).yml
deleted file mode 100644
index b98f21e..0000000
--- a/regex_patterns/Positive (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Positive'
-'pattern': '(?<=^|[\s.-])Positive\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Positive.yml b/regex_patterns/Positive.yml
index 2314ebc..3589c04 100644
--- a/regex_patterns/Positive.yml
+++ b/regex_patterns/Positive.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Positive\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Project-gxs.yml b/regex_patterns/Project-gxs.yml
deleted file mode 100644
index 02f31bd..0000000
--- a/regex_patterns/Project-gxs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Project-gxs'
-pattern: \b(Project-gxs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Proper.yml b/regex_patterns/Proper.yml
deleted file mode 100644
index c75520d..0000000
--- a/regex_patterns/Proper.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Proper
-pattern: \b(Proper)\b
-description: ''
-tags: []
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/PussyFoot (1).yml b/regex_patterns/PussyFoot (1).yml
deleted file mode 100644
index d953b40..0000000
--- a/regex_patterns/PussyFoot (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'PussyFoot'
-'pattern': '(?<=^|[\s.-])PussyFoot\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/PussyFoot.yml b/regex_patterns/PussyFoot.yml
index f10fd54..6cdded8 100644
--- a/regex_patterns/PussyFoot.yml
+++ b/regex_patterns/PussyFoot.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])PussyFoot\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/PuyaSubs.yml b/regex_patterns/PuyaSubs.yml
deleted file mode 100644
index 6abc19c..0000000
--- a/regex_patterns/PuyaSubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'PuyaSubs'
-pattern: \b(PuyaSubs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/QCE.yml b/regex_patterns/QCE.yml
deleted file mode 100644
index f29e339..0000000
--- a/regex_patterns/QCE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'QCE'
-pattern: \b(QCE)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/QOQ (1).yml b/regex_patterns/QOQ (1).yml
deleted file mode 100644
index 5520ed6..0000000
--- a/regex_patterns/QOQ (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "QOQ" when preceded by whitespace, a hyphen or dot'
-'name': 'QOQ'
-'pattern': '(?<=^|[\s.-])QOQ\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/QOQ.yml b/regex_patterns/QOQ.yml
index 5ef9a9f..b589d8b 100644
--- a/regex_patterns/QOQ.yml
+++ b/regex_patterns/QOQ.yml
@@ -1,6 +1,7 @@
-name: 'QOQ'
-pattern: '^(QOQ)$'
-description: ''
+name: QOQ
+pattern: (?<=^|[\s.-])QOQ\b
+description: Matches "QOQ" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/QaS.yml b/regex_patterns/QaS.yml
deleted file mode 100644
index 1d6b4ad..0000000
--- a/regex_patterns/QaS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'QaS'
-pattern: \b(QAS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Quetzal (1).yml b/regex_patterns/Quetzal (1).yml
deleted file mode 100644
index a189434..0000000
--- a/regex_patterns/Quetzal (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Quetzal'
-'pattern': '(?<=^|[\s.-])Quetzal\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Quetzal.yml b/regex_patterns/Quetzal.yml
index 66b7c4a..f01d3a4 100644
--- a/regex_patterns/Quetzal.yml
+++ b/regex_patterns/Quetzal.yml
@@ -1,6 +1,7 @@
-name: 'Quetzal'
-pattern: \b(Quetzal)\b
+name: Quetzal
+pattern: (?<=^|[\s.-])Quetzal\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/QxR.yml b/regex_patterns/QxR.yml
index 02e7d09..d7faaa6 100644
--- a/regex_patterns/QxR.yml
+++ b/regex_patterns/QxR.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'QxR'
-'pattern': '(?<=^|[\s.-])QxR|Tigole|FreetheFish|SAMPA|afm72|Silence|r00t|YOGI|MONOLITH|Panda|Kappa|t3nzin|RCVR|ImE|RZeroX|Garshasp|Ghost|Bandi|Natty\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: QxR
+pattern: (?<=^|[\s.-])QxR|Tigole|FreetheFish|SAMPA|afm72|Silence|r00t|YOGI|MONOLITH|Panda|Kappa|t3nzin|RCVR|ImE|RZeroX|Garshasp|Ghost|Bandi|Natty\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/R.yml b/regex_patterns/R.yml
deleted file mode 100644
index c585d5b..0000000
--- a/regex_patterns/R.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: R
-pattern: (?<=^|[\s.-])R\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/RAI.yml b/regex_patterns/RAI.yml
deleted file mode 100644
index f91f82f..0000000
--- a/regex_patterns/RAI.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RAI
-pattern: \b(RAI)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RARBG.yml b/regex_patterns/RARBG.yml
deleted file mode 100644
index fe476bc..0000000
--- a/regex_patterns/RARBG.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RARBG
-pattern: ^(RARBG)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/RARGB.yml b/regex_patterns/RARGB.yml
index 40284c0..260eb09 100644
--- a/regex_patterns/RARGB.yml
+++ b/regex_patterns/RARGB.yml
@@ -1,8 +1,8 @@
-'description': ''
-'name': 'RARGB'
-'pattern': '(?<=^|[\s.-])RARGB\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-- 'Bluray'
-'tests': []
+name: RARGB
+pattern: (?<=^|[\s.-])RARGB\b
+description: ''
+tags:
+- Release Group
+- Remux
+- Bluray
+tests: []
diff --git a/regex_patterns/RDN.yml b/regex_patterns/RDN.yml
deleted file mode 100644
index 91a72e1..0000000
--- a/regex_patterns/RDN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RDN
-pattern: ^(RDN)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/REBORN (1).yml b/regex_patterns/REBORN (1).yml
deleted file mode 100644
index da43920..0000000
--- a/regex_patterns/REBORN (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'REBORN'
-'pattern': '(?<=^|[\s.-])REBORN\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/REBORN.yml b/regex_patterns/REBORN.yml
index 00e0694..0b03301 100644
--- a/regex_patterns/REBORN.yml
+++ b/regex_patterns/REBORN.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])REBORN\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/REVO.yml b/regex_patterns/REVO.yml
deleted file mode 100644
index 0e19103..0000000
--- a/regex_patterns/REVO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'REVO'
-pattern: \b(REVO)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/RH.yml b/regex_patterns/RH.yml
deleted file mode 100644
index b56dfe2..0000000
--- a/regex_patterns/RH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'RH'
-pattern: \b(RH)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RMX.yml b/regex_patterns/RMX.yml
deleted file mode 100644
index 5f00262..0000000
--- a/regex_patterns/RMX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'RMX'
-pattern: \b(RMX)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ROCCaT.yml b/regex_patterns/ROCCaT.yml
deleted file mode 100644
index c7c589d..0000000
--- a/regex_patterns/ROCCaT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ROCCaT'
-pattern: '^(ROCCaT)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RTFM.yml b/regex_patterns/RTFM.yml
deleted file mode 100644
index 22d552d..0000000
--- a/regex_patterns/RTFM.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RTFM
-pattern: ^(RTFM)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RTN.yml b/regex_patterns/RTN.yml
deleted file mode 100644
index 8e24f9d..0000000
--- a/regex_patterns/RTN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'RTN'
-pattern: ^(RTN)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RU4HD.yml b/regex_patterns/RU4HD.yml
deleted file mode 100644
index 375c563..0000000
--- a/regex_patterns/RU4HD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RU4HD
-pattern: ^(RU4HD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Raizel (1).yml b/regex_patterns/Raizel (1).yml
deleted file mode 100644
index ffa5b2f..0000000
--- a/regex_patterns/Raizel (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Raizel'
-'pattern': '(?<=^|[\s.-])Raizel\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Raizel.yml b/regex_patterns/Raizel.yml
index a736cd0..f760247 100644
--- a/regex_patterns/Raizel.yml
+++ b/regex_patterns/Raizel.yml
@@ -1,6 +1,7 @@
-name: 'Raizel'
-pattern: \b(Raizel)\b
+name: Raizel
+pattern: (?<=^|[\s.-])Raizel\b
 description: ''
 tags:
 - Release Group
-tests: []
\ No newline at end of file
+- Anime
+tests: []
diff --git a/regex_patterns/RandH.yml b/regex_patterns/RandH.yml
deleted file mode 100644
index 66cd3da..0000000
--- a/regex_patterns/RandH.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RandH
-pattern: (?<=^|[\s.-])RandH\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/Rando235.yml b/regex_patterns/Rando235.yml
deleted file mode 100644
index a852d7e..0000000
--- a/regex_patterns/Rando235.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Rando235'
-pattern: \b(Rando235)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Ranger.yml b/regex_patterns/Ranger.yml
deleted file mode 100644
index dc24f3b..0000000
--- a/regex_patterns/Ranger.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Ranger'
-pattern: \[Ranger\]|-Ranger\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Rapta.yml b/regex_patterns/Rapta.yml
deleted file mode 100644
index 1c8a787..0000000
--- a/regex_patterns/Rapta.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Rapta'
-pattern: \[Rapta\]|-Rapta\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Rasetsu (1).yml b/regex_patterns/Rasetsu (1).yml
deleted file mode 100644
index 9be8808..0000000
--- a/regex_patterns/Rasetsu (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Rasetsu'
-'pattern': '(?<=^|[\s.-])Rasetsu\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Rasetsu.yml b/regex_patterns/Rasetsu.yml
index 899e24f..f1c5ab4 100644
--- a/regex_patterns/Rasetsu.yml
+++ b/regex_patterns/Rasetsu.yml
@@ -1,6 +1,7 @@
-name: 'Rasetsu'
-pattern: \b(Rasetsu)\b
+name: Rasetsu
+pattern: (?<=^|[\s.-])Rasetsu\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Raw Files.yml b/regex_patterns/Raw Files.yml
deleted file mode 100644
index f9d59ef..0000000
--- a/regex_patterns/Raw Files.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Raw Files'
-pattern: \b(M2TS|BDMV|BDVD)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Raws-Maji.yml b/regex_patterns/Raws-Maji.yml
deleted file mode 100644
index b6b7690..0000000
--- a/regex_patterns/Raws-Maji.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Raws-Maji'
-pattern: \b(Raws-Maji)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Raze.yml b/regex_patterns/Raze.yml
deleted file mode 100644
index 8f7fc0d..0000000
--- a/regex_patterns/Raze.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Raze'
-pattern: \[Raze\]|-Raze\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ReQuEsT (1).yml b/regex_patterns/ReQuEsT (1).yml
deleted file mode 100644
index fe12068..0000000
--- a/regex_patterns/ReQuEsT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ReQuEsT'
-'pattern': '(?<=^|[\s.-])ReQuEsT\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ReQuEsT.yml b/regex_patterns/ReQuEsT.yml
index 476d074..ef83b1d 100644
--- a/regex_patterns/ReQuEsT.yml
+++ b/regex_patterns/ReQuEsT.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ReQuEsT\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/ReaLHD (1).yml b/regex_patterns/ReaLHD (1).yml
deleted file mode 100644
index 032553c..0000000
--- a/regex_patterns/ReaLHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ReaLHD'
-'pattern': '(?<=^|[\s.-])ReaLHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ReaLHD.yml b/regex_patterns/ReaLHD.yml
index 21b227e..8cd2caa 100644
--- a/regex_patterns/ReaLHD.yml
+++ b/regex_patterns/ReaLHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ReaLHD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Reaktor.yml b/regex_patterns/Reaktor.yml
deleted file mode 100644
index 59173cc..0000000
--- a/regex_patterns/Reaktor.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Reaktor'
-pattern: \b(Reaktor)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RedBlade.yml b/regex_patterns/RedBlade.yml
deleted file mode 100644
index 1fea863..0000000
--- a/regex_patterns/RedBlade.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'RedBlade'
-pattern: \b(RedBlade)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Release Group (Missing).yml b/regex_patterns/Release Group (Missing).yml
index 9900caf..57da380 100644
--- a/regex_patterns/Release Group (Missing).yml	
+++ b/regex_patterns/Release Group (Missing).yml	
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'Release Group (Missing)'
-'pattern': '.'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: Release Group (Missing)
+pattern: .
+description: ''
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/Remux (1).yml b/regex_patterns/Remux (1).yml
deleted file mode 100644
index 0eabc6b..0000000
--- a/regex_patterns/Remux (1).yml	
+++ /dev/null
@@ -1,24 +0,0 @@
-'description': 'A remux is a digital video file that maintains the exact quality of
-  the original source (like a Blu-ray or DVD) by copying the video and audio streams
-  without re-encoding them, essentially creating a perfect 1:1 copy. Think of it like
-  carefully transferring the contents of a Blu-ray disc into a more convenient container
-  file format (typically MKV), similar to pouring fine wine from its bottle into a
-  decanter without changing the wine itself.'
-'name': 'Remux'
-'pattern': 'Remux'
-'tags':
-- 'Codec'
-- 'h264'
-- 'h265'
-- 'Lossless'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': '1917 (2019) 2160p UHD BluRay REMUX HEVC DV HDR10+ TrueHD Atmos 7.1 English-FraMeSToR'
-  'lastRun': '2025-06-16T08:17:22.781547'
-  'matchSpan':
-    'end': 34
-    'start': 29
-  'matchedContent': 'REMUX'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Remux.yml b/regex_patterns/Remux.yml
index 70d3174..ac6cfff 100644
--- a/regex_patterns/Remux.yml
+++ b/regex_patterns/Remux.yml
@@ -1,5 +1,5 @@
 name: Remux
-pattern: remux
+pattern: Remux
 description: A remux is a digital video file that maintains the exact quality of the
   original source (like a Blu-ray or DVD) by copying the video and audio streams without
   re-encoding them, essentially creating a perfect 1:1 copy. Think of it like carefully
@@ -15,7 +15,7 @@ tests:
 - expected: true
   id: 1
   input: 1917 (2019) 2160p UHD BluRay REMUX HEVC DV HDR10+ TrueHD Atmos 7.1 English-FraMeSToR
-  lastRun: '2024-12-07T00:09:00.820662'
+  lastRun: '2025-06-16T08:17:22.781547'
   matchSpan:
     end: 34
     start: 29
diff --git a/regex_patterns/Repack.yml b/regex_patterns/Repack.yml
deleted file mode 100644
index edd2fbd..0000000
--- a/regex_patterns/Repack.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: Repack
-pattern: \b(Repack)\b
-description: ''
-tags:
-- Repack
-- Flag
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Repack1 (1).yml b/regex_patterns/Repack1 (1).yml
deleted file mode 100644
index 13a4619..0000000
--- a/regex_patterns/Repack1 (1).yml	
+++ /dev/null
@@ -1,86 +0,0 @@
-'description': 'Matches ''PROPER'' or ''REPACK'' or ''RERIP'' only when they appear
-  after a year (4 digits) but not before one.
-
-
-  * `(?<=.*?\d{4}.*?)` - look for a 4-digit number before
-
-  * `\b(re(pack|rip)|proper)\b` - match proper/repack/rerip'
-'name': 'Repack1'
-'pattern': '\b(re(pack|rip)|proper)\b'
-'tags':
-- 'Repack'
-- 'Flag'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Zone of Interest 2023 PROPER 2160p UHD BluRay TrueHD 7.1 Atmos HDR
-    x265-MainFrame'
-  'lastRun': '2025-06-17T18:42:29.675411'
-  'matchSpan':
-    'end': 32
-    'start': 26
-  'matchedContent': 'PROPER'
-  'matchedGroups':
-  - 'PROPER'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Proper.Pronouns.2020.720p.WEB-DL.AAC2.0.x264-ZTR.mkv'
-  'lastRun': '2025-06-17T18:42:29.675411'
-  'matchSpan':
-    'end': 6
-    'start': 0
-  'matchedContent': 'Proper'
-  'matchedGroups':
-  - 'Proper'
-  - null
-  'passes': false
-- 'expected': true
-  'id': 3
-  'input': 'Proper.Pronouns.2020.720p.PROPER.WEB-DL.AAC2.0.x264-ZTR.mkv'
-  'lastRun': '2025-06-17T18:42:29.675411'
-  'matchSpan':
-    'end': 6
-    'start': 0
-  'matchedContent': 'Proper'
-  'matchedGroups':
-  - 'Proper'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Sonic.the.Hedgehog.3.2024.REPACK.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX'
-  'lastRun': '2025-06-17T18:42:29.675411'
-  'matchSpan':
-    'end': 32
-    'start': 26
-  'matchedContent': 'REPACK'
-  'matchedGroups':
-  - 'REPACK'
-  - 'PACK'
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'roommate.wanted.2015.rerip.720p.bluray.x264-rusted.mkv'
-  'lastRun': '2025-06-17T18:42:29.675411'
-  'matchSpan':
-    'end': 26
-    'start': 21
-  'matchedContent': 'rerip'
-  'matchedGroups':
-  - 'rerip'
-  - 'rip'
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'Game of Thrones S01 REPACK 2160p MAX WEB-DL TrueHD 7.1 Atmos DV HDR H.265-Kitsune'
-  'lastRun': '2025-06-17T18:42:29.675411'
-  'matchSpan':
-    'end': 26
-    'start': 20
-  'matchedContent': 'REPACK'
-  'matchedGroups':
-  - 'REPACK'
-  - 'PACK'
-  'passes': true
diff --git a/regex_patterns/Repack1.yml b/regex_patterns/Repack1.yml
index feaf481..17fbf28 100644
--- a/regex_patterns/Repack1.yml
+++ b/regex_patterns/Repack1.yml
@@ -1,5 +1,5 @@
 name: Repack1
-pattern: (?<=.*?\d{4}.*?)\b(re(pack|rip)|proper)\b
+pattern: \b(re(pack|rip)|proper)\b
 description: 'Matches ''PROPER'' or ''REPACK'' or ''RERIP'' only when they appear
   after a year (4 digits) but not before one.
 
@@ -14,7 +14,7 @@ tests:
 - expected: true
   id: 1
   input: The Zone of Interest 2023 PROPER 2160p UHD BluRay TrueHD 7.1 Atmos HDR x265-MainFrame
-  lastRun: '2025-02-06T06:58:16.693168'
+  lastRun: '2025-06-17T18:42:29.675411'
   matchSpan:
     end: 32
     start: 26
@@ -26,27 +26,31 @@ tests:
 - expected: false
   id: 2
   input: Proper.Pronouns.2020.720p.WEB-DL.AAC2.0.x264-ZTR.mkv
-  lastRun: '2025-02-06T06:58:16.693168'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
+  lastRun: '2025-06-17T18:42:29.675411'
+  matchSpan:
+    end: 6
+    start: 0
+  matchedContent: Proper
+  matchedGroups:
+  - Proper
+  - null
+  passes: false
 - expected: true
   id: 3
   input: Proper.Pronouns.2020.720p.PROPER.WEB-DL.AAC2.0.x264-ZTR.mkv
-  lastRun: '2025-02-06T06:58:16.693168'
+  lastRun: '2025-06-17T18:42:29.675411'
   matchSpan:
-    end: 32
-    start: 26
-  matchedContent: PROPER
+    end: 6
+    start: 0
+  matchedContent: Proper
   matchedGroups:
-  - PROPER
+  - Proper
   - null
   passes: true
 - expected: true
   id: 4
   input: Sonic.the.Hedgehog.3.2024.REPACK.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX
-  lastRun: '2025-02-06T06:58:16.693168'
+  lastRun: '2025-06-17T18:42:29.675411'
   matchSpan:
     end: 32
     start: 26
@@ -58,7 +62,7 @@ tests:
 - expected: true
   id: 5
   input: roommate.wanted.2015.rerip.720p.bluray.x264-rusted.mkv
-  lastRun: '2025-02-06T06:58:16.693168'
+  lastRun: '2025-06-17T18:42:29.675411'
   matchSpan:
     end: 26
     start: 21
@@ -67,3 +71,15 @@ tests:
   - rerip
   - rip
   passes: true
+- expected: true
+  id: 6
+  input: Game of Thrones S01 REPACK 2160p MAX WEB-DL TrueHD 7.1 Atmos DV HDR H.265-Kitsune
+  lastRun: '2025-06-17T18:42:29.675411'
+  matchSpan:
+    end: 26
+    start: 20
+  matchedContent: REPACK
+  matchedGroups:
+  - REPACK
+  - PACK
+  passes: true
diff --git a/regex_patterns/Repack2 (1).yml b/regex_patterns/Repack2 (1).yml
deleted file mode 100644
index 316f32e..0000000
--- a/regex_patterns/Repack2 (1).yml	
+++ /dev/null
@@ -1,129 +0,0 @@
-'description': 'Matches either "real" (with optional space/dot) followed by proper/repack/rerip,
-  or proper2/repack2/rerip2
-
-
-  * `\b(real[\s.]?(re(pack|rip)|proper)` - match real followed by proper/repack/rerip
-
-  * `|(re(pack|rip)|proper)2)\b` - or match proper2/repack2/rerip2'
-'name': 'Repack2'
-'pattern': '\b(real[\s.]?(re(pack|rip)|proper)|(re(pack|rip)|proper)2)\b'
-'tags':
-- 'Repack'
-- 'Flag'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Zone of Interest 2023 PROPER2 2160p UHD BluRay TrueHD 7.1 Atmos HDR
-    x265-MainFrame'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'PROPER2'
-  'matchedGroups':
-  - 'PROPER2'
-  - null
-  - null
-  - 'PROPER'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Proper.Pronouns.2020.720p.WEB-DL.AAC2.0.x264-ZTR.mkv'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Proper.Pronouns.2020.720p.PROPER2.WEB-DL.AAC2.0.x264-ZTR.mkv'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'PROPER2'
-  'matchedGroups':
-  - 'PROPER2'
-  - null
-  - null
-  - 'PROPER'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Sonic.the.Hedgehog.3.2024.REPACK2.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'REPACK2'
-  'matchedGroups':
-  - 'REPACK2'
-  - null
-  - null
-  - 'REPACK'
-  - 'PACK'
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'roommate.wanted.2015.rerip2.720p.bluray.x264-rusted.mkv'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan':
-    'end': 27
-    'start': 21
-  'matchedContent': 'rerip2'
-  'matchedGroups':
-  - 'rerip2'
-  - null
-  - null
-  - 'rerip'
-  - 'rip'
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'The Zone of Interest 2023 PROPER 2160p UHD BluRay TrueHD 7.1 Atmos HDR
-    x265-MainFrame'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'Sonic.the.Hedgehog.3.2024.REPACK.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Yo-Kai Watch S02E17 DUBBED REAL REPACK HDTV x264-W4F'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan':
-    'end': 38
-    'start': 27
-  'matchedContent': 'REAL REPACK'
-  'matchedGroups':
-  - 'REAL REPACK'
-  - 'REPACK'
-  - 'PACK'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'Game of Thrones S01 REPACK2 2160p MAX WEB-DL TrueHD 7.1 Atmos DV HDR H.265-Kitsune'
-  'lastRun': '2025-06-17T18:46:34.789609'
-  'matchSpan':
-    'end': 27
-    'start': 20
-  'matchedContent': 'REPACK2'
-  'matchedGroups':
-  - 'REPACK2'
-  - null
-  - null
-  - 'REPACK'
-  - 'PACK'
-  'passes': true
diff --git a/regex_patterns/Repack2.yml b/regex_patterns/Repack2.yml
index e71deb8..6fdbf47 100644
--- a/regex_patterns/Repack2.yml
+++ b/regex_patterns/Repack2.yml
@@ -14,7 +14,7 @@ tests:
 - expected: true
   id: 1
   input: The Zone of Interest 2023 PROPER2 2160p UHD BluRay TrueHD 7.1 Atmos HDR x265-MainFrame
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan:
     end: 33
     start: 26
@@ -29,7 +29,7 @@ tests:
 - expected: false
   id: 2
   input: Proper.Pronouns.2020.720p.WEB-DL.AAC2.0.x264-ZTR.mkv
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -37,7 +37,7 @@ tests:
 - expected: true
   id: 3
   input: Proper.Pronouns.2020.720p.PROPER2.WEB-DL.AAC2.0.x264-ZTR.mkv
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan:
     end: 33
     start: 26
@@ -52,7 +52,7 @@ tests:
 - expected: true
   id: 4
   input: Sonic.the.Hedgehog.3.2024.REPACK2.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan:
     end: 33
     start: 26
@@ -67,7 +67,7 @@ tests:
 - expected: true
   id: 5
   input: roommate.wanted.2015.rerip2.720p.bluray.x264-rusted.mkv
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan:
     end: 27
     start: 21
@@ -82,7 +82,7 @@ tests:
 - expected: false
   id: 6
   input: The Zone of Interest 2023 PROPER 2160p UHD BluRay TrueHD 7.1 Atmos HDR x265-MainFrame
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -90,7 +90,7 @@ tests:
 - expected: false
   id: 7
   input: Sonic.the.Hedgehog.3.2024.REPACK.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -98,7 +98,7 @@ tests:
 - expected: true
   id: 8
   input: Yo-Kai Watch S02E17 DUBBED REAL REPACK HDTV x264-W4F
-  lastRun: '2025-02-06T07:10:05.298113'
+  lastRun: '2025-06-17T18:46:34.789609'
   matchSpan:
     end: 38
     start: 27
@@ -110,3 +110,18 @@ tests:
   - null
   - null
   passes: true
+- expected: true
+  id: 9
+  input: Game of Thrones S01 REPACK2 2160p MAX WEB-DL TrueHD 7.1 Atmos DV HDR H.265-Kitsune
+  lastRun: '2025-06-17T18:46:34.789609'
+  matchSpan:
+    end: 27
+    start: 20
+  matchedContent: REPACK2
+  matchedGroups:
+  - REPACK2
+  - null
+  - null
+  - REPACK
+  - PACK
+  passes: true
diff --git a/regex_patterns/Repack3 (1).yml b/regex_patterns/Repack3 (1).yml
deleted file mode 100644
index 7a10665..0000000
--- a/regex_patterns/Repack3 (1).yml	
+++ /dev/null
@@ -1,129 +0,0 @@
-'description': 'Matches either "real real" (with optional space/dot between words)
-  followed by proper/repack/rerip, or proper3/repack3/rerip3
-
-
-  * `\b(real[\s.]?real[\s.]?(re(pack|rip)|proper)` - match real real followed by proper/repack/rerip
-
-  * `|(re(pack|rip)|proper)3)\b` - or match proper3/repack3/rerip3'
-'name': 'Repack3'
-'pattern': '\b(real[\s.]?real[\s.]?(re(pack|rip)|proper)|(re(pack|rip)|proper)3)\b'
-'tags':
-- 'Repack'
-- 'Flag'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The Zone of Interest 2023 PROPER3 2160p UHD BluRay TrueHD 7.1 Atmos HDR
-    x265-MainFrame'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'PROPER3'
-  'matchedGroups':
-  - 'PROPER3'
-  - null
-  - null
-  - 'PROPER'
-  - null
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Proper.Pronouns.2020.720p.WEB-DL.AAC2.0.x264-ZTR.mkv'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Proper.Pronouns.2020.720p.PROPER3.WEB-DL.AAC2.0.x264-ZTR.mkv'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'PROPER3'
-  'matchedGroups':
-  - 'PROPER3'
-  - null
-  - null
-  - 'PROPER'
-  - null
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Sonic.the.Hedgehog.3.2024.REPACK3.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'REPACK3'
-  'matchedGroups':
-  - 'REPACK3'
-  - null
-  - null
-  - 'REPACK'
-  - 'PACK'
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'roommate.wanted.2015.rerip3.720p.bluray.x264-rusted.mkv'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan':
-    'end': 27
-    'start': 21
-  'matchedContent': 'rerip3'
-  'matchedGroups':
-  - 'rerip3'
-  - null
-  - null
-  - 'rerip'
-  - 'rip'
-  'passes': true
-- 'expected': false
-  'id': 6
-  'input': 'The Zone of Interest 2023 PROPER 2160p UHD BluRay TrueHD 7.1 Atmos HDR
-    x265-MainFrame'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'Sonic.the.Hedgehog.3.2024.REPACK.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Yo-Kai Watch S02E17 DUBBED REAL REAL REPACK HDTV x264-W4F'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan':
-    'end': 43
-    'start': 27
-  'matchedContent': 'REAL REAL REPACK'
-  'matchedGroups':
-  - 'REAL REAL REPACK'
-  - 'REPACK'
-  - 'PACK'
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'Game of Thrones S01 REPACK3 2160p MAX WEB-DL TrueHD 7.1 Atmos DV HDR H.265-Kitsune'
-  'lastRun': '2025-06-17T18:46:43.670504'
-  'matchSpan':
-    'end': 27
-    'start': 20
-  'matchedContent': 'REPACK3'
-  'matchedGroups':
-  - 'REPACK3'
-  - null
-  - null
-  - 'REPACK'
-  - 'PACK'
-  'passes': true
diff --git a/regex_patterns/Repack3.yml b/regex_patterns/Repack3.yml
index b70309b..f3df69c 100644
--- a/regex_patterns/Repack3.yml
+++ b/regex_patterns/Repack3.yml
@@ -14,7 +14,7 @@ tests:
 - expected: true
   id: 1
   input: The Zone of Interest 2023 PROPER3 2160p UHD BluRay TrueHD 7.1 Atmos HDR x265-MainFrame
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan:
     end: 33
     start: 26
@@ -29,7 +29,7 @@ tests:
 - expected: false
   id: 2
   input: Proper.Pronouns.2020.720p.WEB-DL.AAC2.0.x264-ZTR.mkv
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -37,7 +37,7 @@ tests:
 - expected: true
   id: 3
   input: Proper.Pronouns.2020.720p.PROPER3.WEB-DL.AAC2.0.x264-ZTR.mkv
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan:
     end: 33
     start: 26
@@ -52,7 +52,7 @@ tests:
 - expected: true
   id: 4
   input: Sonic.the.Hedgehog.3.2024.REPACK3.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan:
     end: 33
     start: 26
@@ -67,7 +67,7 @@ tests:
 - expected: true
   id: 5
   input: roommate.wanted.2015.rerip3.720p.bluray.x264-rusted.mkv
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan:
     end: 27
     start: 21
@@ -82,7 +82,7 @@ tests:
 - expected: false
   id: 6
   input: The Zone of Interest 2023 PROPER 2160p UHD BluRay TrueHD 7.1 Atmos HDR x265-MainFrame
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -90,7 +90,7 @@ tests:
 - expected: false
   id: 7
   input: Sonic.the.Hedgehog.3.2024.REPACK.2160p.WEB-DL.DDP5.1.Atmos.DoVi.HDR.H.265-FLUX
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
@@ -98,7 +98,7 @@ tests:
 - expected: true
   id: 8
   input: Yo-Kai Watch S02E17 DUBBED REAL REAL REPACK HDTV x264-W4F
-  lastRun: '2025-02-06T07:11:35.323972'
+  lastRun: '2025-06-17T18:46:43.670504'
   matchSpan:
     end: 43
     start: 27
@@ -110,3 +110,18 @@ tests:
   - null
   - null
   passes: true
+- expected: true
+  id: 9
+  input: Game of Thrones S01 REPACK3 2160p MAX WEB-DL TrueHD 7.1 Atmos DV HDR H.265-Kitsune
+  lastRun: '2025-06-17T18:46:43.670504'
+  matchSpan:
+    end: 27
+    start: 20
+  matchedContent: REPACK3
+  matchedGroups:
+  - REPACK3
+  - null
+  - null
+  - REPACK
+  - PACK
+  passes: true
diff --git a/regex_patterns/Rerip.yml b/regex_patterns/Rerip.yml
deleted file mode 100644
index 2af500e..0000000
--- a/regex_patterns/Rerip.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Rerip
-pattern: \b(Rerip)\b
-description: ''
-tags: []
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Reza.yml b/regex_patterns/Reza.yml
deleted file mode 100644
index 5876040..0000000
--- a/regex_patterns/Reza.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Reza'
-pattern: \b(Reza)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RiffTrax.yml b/regex_patterns/RiffTrax.yml
deleted file mode 100644
index da8a601..0000000
--- a/regex_patterns/RiffTrax.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: RiffTrax
-pattern: ^(Rifftrax)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/RightShiftBy2.yml b/regex_patterns/RightShiftBy2.yml
deleted file mode 100644
index 37723b7..0000000
--- a/regex_patterns/RightShiftBy2.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'RightShiftBy2'
-pattern: \b(RightShiftBy2)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Rip-Time.yml b/regex_patterns/Rip-Time.yml
deleted file mode 100644
index ffd9ce0..0000000
--- a/regex_patterns/Rip-Time.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Rip Time'
-pattern: \b(Rip[ .-]?Time)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/RlsGrp-(Missing-HDR).yml b/regex_patterns/RlsGrp-(Missing-HDR).yml
deleted file mode 100644
index 6aa4e9d..0000000
--- a/regex_patterns/RlsGrp-(Missing-HDR).yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'RlsGrp (Missing HDR)'
-pattern: '\\b(FraMeSToR|HQMUX|SiCFoI)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Roku (1).yml b/regex_patterns/Roku (1).yml
deleted file mode 100644
index 21554d6..0000000
--- a/regex_patterns/Roku (1).yml	
+++ /dev/null
@@ -1,50 +0,0 @@
-'description': 'The Roku Channel is an over-the-top video streaming service available
-  in the U.S., Canada, Mexico and the U.K. Launched in September 2017. The Roku Channel
-  offers over 400 free live linear TV channels, more than 80,000 free movies and shows,
-  and access to paid content.'
-'name': 'Roku'
-'pattern': '(?<=\b[12]\d{3}\b).*\b(ROKU)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': '10 Minutes Gone 2019 1080p ROKU WEB-DL DD 5 1 H 264-PiRaTeS'
-  'lastRun': '2025-06-16T08:12:32.176786'
-  'matchSpan':
-    'end': 31
-    'start': 20
-  'matchedContent': ' 1080p ROKU'
-  'matchedGroups':
-  - 'ROKU'
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Natsume''s Book of Friends S06 AKA Natsume Yuujinchou Roku 1080p BluRay
-    FLAC 2.0 Hi10P x264-CyC'
-  'lastRun': '2025-06-16T08:12:32.176786'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Natsume''s Book of Friends AKA Natsume Yuujinchou Roku S06 1080p CR WEB-DL
-    Dubbed AAC 2.0 H.264-Yameii'
-  'lastRun': '2025-06-16T08:12:32.176786'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Flower & Garnet 2002 480p ROKU WEB-DL AAC 2.0 H.264-vase'
-  'lastRun': '2025-06-16T08:12:32.176786'
-  'matchSpan':
-    'end': 30
-    'start': 20
-  'matchedContent': ' 480p ROKU'
-  'matchedGroups':
-  - 'ROKU'
-  'passes': true
diff --git a/regex_patterns/Roku.yml b/regex_patterns/Roku.yml
index 5fef390..0bf4f0f 100644
--- a/regex_patterns/Roku.yml
+++ b/regex_patterns/Roku.yml
@@ -1,5 +1,5 @@
 name: Roku
-pattern: \b(1080p[ .\-_]ROKU|ROKU[ .\-_]1080p)\b
+pattern: (?<=\b[12]\d{3}\b).*\b(ROKU)\b
 description: The Roku Channel is an over-the-top video streaming service available
   in the U.S., Canada, Mexico and the U.K. Launched in September 2017. The Roku Channel
   offers over 400 free live linear TV channels, more than 80,000 free movies and shows,
@@ -7,37 +7,44 @@ description: The Roku Channel is an over-the-top video streaming service availab
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: true
   id: 1
   input: 10 Minutes Gone 2019 1080p ROKU WEB-DL DD 5 1 H 264-PiRaTeS
-  lastRun: '2024-12-06T05:35:49.092439'
+  lastRun: '2025-06-16T08:12:32.176786'
   matchSpan:
     end: 31
-    start: 21
-  matchedContent: 1080p ROKU
+    start: 20
+  matchedContent: ' 1080p ROKU'
   matchedGroups:
-  - 1080p ROKU
+  - ROKU
   passes: true
 - expected: false
   id: 2
   input: Natsume's Book of Friends S06 AKA Natsume Yuujinchou Roku 1080p BluRay FLAC
     2.0 Hi10P x264-CyC
-  lastRun: '2024-12-06T05:35:49.092439'
-  matchSpan:
-    end: 63
-    start: 53
-  matchedContent: Roku 1080p
-  matchedGroups:
-  - Roku 1080p
-  passes: false
-- expected: false
-  id: 3
-  input: Natsume's Book of Friends AKA Natsume Yuujinchou Roku S06 1080p CR WEB-DL
-    Dubbed AAC 2.0 H.264-Yameii
-  lastRun: '2024-12-06T05:35:49.092439'
+  lastRun: '2025-06-16T08:12:32.176786'
   matchSpan: null
   matchedContent: null
   matchedGroups: []
   passes: true
+- expected: false
+  id: 3
+  input: Natsume's Book of Friends AKA Natsume Yuujinchou Roku S06 1080p CR WEB-DL
+    Dubbed AAC 2.0 H.264-Yameii
+  lastRun: '2025-06-16T08:12:32.176786'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 4
+  input: Flower & Garnet 2002 480p ROKU WEB-DL AAC 2.0 H.264-vase
+  lastRun: '2025-06-16T08:12:32.176786'
+  matchSpan:
+    end: 30
+    start: 20
+  matchedContent: ' 480p ROKU'
+  matchedGroups:
+  - ROKU
+  passes: true
diff --git a/regex_patterns/SA89 (1).yml b/regex_patterns/SA89 (1).yml
deleted file mode 100644
index 83065f5..0000000
--- a/regex_patterns/SA89 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SA89'
-'pattern': '(?<=^|[\s.-])SA89\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SA89.yml b/regex_patterns/SA89.yml
index 9197452..0c3b29f 100644
--- a/regex_patterns/SA89.yml
+++ b/regex_patterns/SA89.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SA89\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/SAD.yml b/regex_patterns/SAD.yml
deleted file mode 100644
index 912771c..0000000
--- a/regex_patterns/SAD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SAD'
-pattern: \[SAD\]|-SAD\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SANTi.yml b/regex_patterns/SANTi.yml
deleted file mode 100644
index 3350309..0000000
--- a/regex_patterns/SANTi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SANTi
-pattern: ^(SANTi)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/SCP-2223.yml b/regex_patterns/SCP-2223.yml
deleted file mode 100644
index 9962e17..0000000
--- a/regex_patterns/SCP-2223.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SCP-2223'
-pattern: \b(SCP-2223)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SCY (1).yml b/regex_patterns/SCY (1).yml
deleted file mode 100644
index f0d7714..0000000
--- a/regex_patterns/SCY (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SCY'
-'pattern': '(?<=^|[\s.-])SCY\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/SCY.yml b/regex_patterns/SCY.yml
index f764b43..b200ea8 100644
--- a/regex_patterns/SCY.yml
+++ b/regex_patterns/SCY.yml
@@ -1,6 +1,7 @@
 name: SCY
-pattern: \b(SCY)\b
+pattern: (?<=^|[\s.-])SCY\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/SDCC.yml b/regex_patterns/SDCC.yml
deleted file mode 100644
index b7ab267..0000000
--- a/regex_patterns/SDCC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SDCC
-pattern: ^(SDCC)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SDR (1).yml b/regex_patterns/SDR (1).yml
deleted file mode 100644
index 52f15f2..0000000
--- a/regex_patterns/SDR (1).yml	
+++ /dev/null
@@ -1,29 +0,0 @@
-'description': 'Explicitly matches labelled Standard Dynamic Range, i.e. "SDR" '
-'name': 'SDR'
-'pattern': '\b(SDR)\b'
-'tags':
-- 'HDR'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Yojimbo.1961.REPACK.2160p.UHD.Blu-ray.Remux.SDR.HEVC.FLAC.1.0-CiNEPHiLES.mkv'
-  'lastRun': '2025-04-15T14:47:06.326256'
-  'matchSpan':
-    'end': 47
-    'start': 44
-  'matchedContent': 'SDR'
-  'matchedGroups':
-  - 'SDR'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': "For a Few Dollars More aka Per qualche dollaro in pi\xF9 1965 UHD BluRay\
-    \ 2160p DTS-HD MA 5.1 SDR HEVC REMUX-FraMeSToR"
-  'lastRun': '2025-04-15T14:47:06.326256'
-  'matchSpan':
-    'end': 93
-    'start': 90
-  'matchedContent': 'SDR'
-  'matchedGroups':
-  - 'SDR'
-  'passes': true
diff --git a/regex_patterns/SDR.yml b/regex_patterns/SDR.yml
index d90b3b1..1c4dcae 100644
--- a/regex_patterns/SDR.yml
+++ b/regex_patterns/SDR.yml
@@ -1,5 +1,5 @@
 name: SDR
-pattern: \bSDR\b
+pattern: \b(SDR)\b
 description: 'Explicitly matches labelled Standard Dynamic Range, i.e. "SDR" '
 tags:
 - HDR
@@ -7,21 +7,23 @@ tests:
 - expected: true
   id: 1
   input: Yojimbo.1961.REPACK.2160p.UHD.Blu-ray.Remux.SDR.HEVC.FLAC.1.0-CiNEPHiLES.mkv
-  lastRun: '2025-01-11T22:58:34.197378'
+  lastRun: '2025-04-15T14:47:06.326256'
   matchSpan:
     end: 47
     start: 44
   matchedContent: SDR
-  matchedGroups: []
+  matchedGroups:
+  - SDR
   passes: true
 - expected: true
   id: 2
   input: "For a Few Dollars More aka Per qualche dollaro in pi\xF9 1965 UHD BluRay\
     \ 2160p DTS-HD MA 5.1 SDR HEVC REMUX-FraMeSToR"
-  lastRun: '2025-01-11T22:58:34.197378'
+  lastRun: '2025-04-15T14:47:06.326256'
   matchSpan:
     end: 93
     start: 90
   matchedContent: SDR
-  matchedGroups: []
+  matchedGroups:
+  - SDR
   passes: true
diff --git a/regex_patterns/SESKAPiLE.yml b/regex_patterns/SESKAPiLE.yml
deleted file mode 100644
index cfc6039..0000000
--- a/regex_patterns/SESKAPiLE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SESKAPiLE
-pattern: (?<=^|[\s.-])SESKAPiLE\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/SEV.yml b/regex_patterns/SEV.yml
deleted file mode 100644
index e0d6ea8..0000000
--- a/regex_patterns/SEV.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SEV'
-pattern: \b(SEV)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SEiN.yml b/regex_patterns/SEiN.yml
deleted file mode 100644
index 074e964..0000000
--- a/regex_patterns/SEiN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SEiN'
-pattern: \[SEiN\]|-SEiN\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SHD.yml b/regex_patterns/SHD.yml
deleted file mode 100644
index 0d44bb0..0000000
--- a/regex_patterns/SHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SHD
-pattern: ^(SHD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/SHFS.yml b/regex_patterns/SHFS.yml
deleted file mode 100644
index 029d051..0000000
--- a/regex_patterns/SHFS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SHFS'
-pattern: \b(SHFS)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SHiN-gx.yml b/regex_patterns/SHiN-gx.yml
deleted file mode 100644
index 7b4cfe0..0000000
--- a/regex_patterns/SHiN-gx.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SHiN-gx'
-pattern: \b(SHiN-gx)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SLAX.yml b/regex_patterns/SLAX.yml
deleted file mode 100644
index 2add251..0000000
--- a/regex_patterns/SLAX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SLAX'
-pattern: \b(SLAX)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SLiGNOME.yml b/regex_patterns/SLiGNOME.yml
deleted file mode 100644
index 94e4381..0000000
--- a/regex_patterns/SLiGNOME.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SLiGNOME'
-pattern: '^(SLiGNOME)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SM737 (1).yml b/regex_patterns/SM737 (1).yml
deleted file mode 100644
index 57edbcc..0000000
--- a/regex_patterns/SM737 (1).yml	
+++ /dev/null
@@ -1,17 +0,0 @@
-'description': ''
-'name': 'SM737'
-'pattern': '(?<=^|[\s.-])SM737\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Training.Day.2001.UHD.BluRay.1080p.DD+Atmos.5.1.DoVi.HDR10.x265-SM737'
-  'lastRun': '2025-01-13T07:59:06.177271'
-  'matchSpan':
-    'end': 69
-    'start': 64
-  'matchedContent': 'SM737'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/SM737.yml b/regex_patterns/SM737.yml
index 377ebce..af8fdbf 100644
--- a/regex_patterns/SM737.yml
+++ b/regex_patterns/SM737.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])SM737\b
 description: ''
 tags:
 - Release Group
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/SMAHAWUG (1).yml b/regex_patterns/SMAHAWUG (1).yml
deleted file mode 100644
index 5e48383..0000000
--- a/regex_patterns/SMAHAWUG (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SMAHAWUG'
-'pattern': '(?<=^|[\s.-])SMAHAWUG\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SMAHAWUG.yml b/regex_patterns/SMAHAWUG.yml
index ee94578..50d17d1 100644
--- a/regex_patterns/SMAHAWUG.yml
+++ b/regex_patterns/SMAHAWUG.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SMAHAWUG\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SMURF (1).yml b/regex_patterns/SMURF (1).yml
deleted file mode 100644
index 9f057c9..0000000
--- a/regex_patterns/SMURF (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SMURF'
-'pattern': '(?<=^|[\s.-])SMURF\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/SMURF.yml b/regex_patterns/SMURF.yml
index e377a05..f7cbd27 100644
--- a/regex_patterns/SMURF.yml
+++ b/regex_patterns/SMURF.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SMURF\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/SNSbu.yml b/regex_patterns/SNSbu.yml
deleted file mode 100644
index 696b174..0000000
--- a/regex_patterns/SNSbu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SNSbu'
-pattern: \b(SNSbu)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SOLA.yml b/regex_patterns/SOLA.yml
deleted file mode 100644
index d5e15f1..0000000
--- a/regex_patterns/SOLA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SOLA'
-pattern: \[SOLA\]|-SOLA\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SOP (1).yml b/regex_patterns/SOP (1).yml
deleted file mode 100644
index 2da864f..0000000
--- a/regex_patterns/SOP (1).yml	
+++ /dev/null
@@ -1,17 +0,0 @@
-'description': ''
-'name': 'SOP'
-'pattern': '(?<=^|[\s.-])SOP\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Interstellar.2014.PROPER.1080p.BluRay.DTS.x264-SoP'
-  'lastRun': '2024-12-22T20:56:46.004338'
-  'matchSpan':
-    'end': 50
-    'start': 47
-  'matchedContent': 'SoP'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/SOP.yml b/regex_patterns/SOP.yml
index 157cef0..9306e65 100644
--- a/regex_patterns/SOP.yml
+++ b/regex_patterns/SOP.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])SOP\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/SP4K.yml b/regex_patterns/SP4K.yml
deleted file mode 100644
index 9968ad1..0000000
--- a/regex_patterns/SP4K.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SP4K
-pattern: (?<=^|[\s.-])SP4K\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/SPECTACLE (1).yml b/regex_patterns/SPECTACLE (1).yml
deleted file mode 100644
index 8b37ee1..0000000
--- a/regex_patterns/SPECTACLE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SPECTACLE'
-'pattern': '(?<=^|[\s.-])SPECTACLE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SPECTACLE.yml b/regex_patterns/SPECTACLE.yml
index 14ae83c..c0dbeaa 100644
--- a/regex_patterns/SPECTACLE.yml
+++ b/regex_patterns/SPECTACLE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SPECTACLE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SPHD (1).yml b/regex_patterns/SPHD (1).yml
deleted file mode 100644
index 2093d11..0000000
--- a/regex_patterns/SPHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SPHD'
-'pattern': '(?<=^|[\s.-])SPHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SPHD.yml b/regex_patterns/SPHD.yml
index 71b41e8..fd4a55f 100644
--- a/regex_patterns/SPHD.yml
+++ b/regex_patterns/SPHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SPHD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SPiRiT.yml b/regex_patterns/SPiRiT.yml
deleted file mode 100644
index 01a7e0f..0000000
--- a/regex_patterns/SPiRiT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SPiRiT
-pattern: ^(SPiRiT)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SQP - AAC.yml b/regex_patterns/SQP - AAC.yml
deleted file mode 100644
index 15ff7d4..0000000
--- a/regex_patterns/SQP - AAC.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - AAC"
-pattern: '\bAAC(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - ATMOS1.yml b/regex_patterns/SQP - ATMOS1.yml
deleted file mode 100644
index 9983d98..0000000
--- a/regex_patterns/SQP - ATMOS1.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - ATMOS1"
-pattern: '\b(ATMOS|CtrlHD|W4NK3R|DON)(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - ATMOS2.yml b/regex_patterns/SQP - ATMOS2.yml
deleted file mode 100644
index b64a13c..0000000
--- a/regex_patterns/SQP - ATMOS2.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - ATMOS2"
-pattern: '\bATMOS(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - ATMOS3.yml b/regex_patterns/SQP - ATMOS3.yml
deleted file mode 100644
index 4da1d30..0000000
--- a/regex_patterns/SQP - ATMOS3.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - ATMOS3"
-pattern: '\b(ATMOS|DDPA)(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - BHDStudio.yml b/regex_patterns/SQP - BHDStudio.yml
deleted file mode 100644
index 89e2856..0000000
--- a/regex_patterns/SQP - BHDStudio.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - BHDStudio"
-pattern: "^(BHDStudio)$"
-description: ''
-tags:
-- Release Group
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Basic DTS.yml b/regex_patterns/SQP - Basic DTS.yml
deleted file mode 100644
index e62563a..0000000
--- a/regex_patterns/SQP - Basic DTS.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Basic DTS"
-pattern: '\bDTS(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Basic Dolby Digital.yml b/regex_patterns/SQP - Basic Dolby Digital.yml
deleted file mode 100644
index 7fa9b25..0000000
--- a/regex_patterns/SQP - Basic Dolby Digital.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Basic Dolby Digital"
-pattern: '\bDD[^a-z+]|(?<!e-)\b(ac-?3)\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - DTS X.yml b/regex_patterns/SQP - DTS X.yml
deleted file mode 100644
index c11ca9f..0000000
--- a/regex_patterns/SQP - DTS X.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - DTS X"
-pattern: '\b(dts[-_.: ]?x7?)\b(?![-_. ]?(26[456]))'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - DTS-ES.yml b/regex_patterns/SQP - DTS-ES.yml
deleted file mode 100644
index 05e6928..0000000
--- a/regex_patterns/SQP - DTS-ES.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - DTS-ES"
-pattern: 'dts[-. ]?es\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - DTS-HD HRA.yml b/regex_patterns/SQP - DTS-HD HRA.yml
deleted file mode 100644
index e0b32dd..0000000
--- a/regex_patterns/SQP - DTS-HD HRA.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: SQP - DTS-HD HRA
-pattern: dts[-. ]?(hd[. ]?)?(hra?|hi\b)
-description: ''
-tags: 
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - DTS-HD MA.yml b/regex_patterns/SQP - DTS-HD MA.yml
deleted file mode 100644
index 23312f7..0000000
--- a/regex_patterns/SQP - DTS-HD MA.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - DTS-HD MA"
-pattern: '\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Dolby Digital Plus.yml b/regex_patterns/SQP - Dolby Digital Plus.yml
deleted file mode 100644
index 1375b77..0000000
--- a/regex_patterns/SQP - Dolby Digital Plus.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Dolby Digital Plus"
-pattern: '\bDD[P+]|\b(e[-_. ]?ac-?3)\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - FLAC.yml b/regex_patterns/SQP - FLAC.yml
deleted file mode 100644
index 4e57638..0000000
--- a/regex_patterns/SQP - FLAC.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - FLAC"
-pattern: '\bFLAC(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not 6.1 Surround.yml b/regex_patterns/SQP - Not 6.1 Surround.yml
deleted file mode 100644
index f89dba9..0000000
--- a/regex_patterns/SQP - Not 6.1 Surround.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: SQP - Not 6.1 Surround
-pattern: '[^0-9]6[ .][0-1]'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not AAC.yml b/regex_patterns/SQP - Not AAC.yml
deleted file mode 100644
index cb43a6c..0000000
--- a/regex_patterns/SQP - Not AAC.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not AAC"
-pattern: '\bAAC(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not Basic DTS.yml b/regex_patterns/SQP - Not Basic DTS.yml
deleted file mode 100644
index 0f96222..0000000
--- a/regex_patterns/SQP - Not Basic DTS.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not Basic DTS"
-pattern: 'DTS[ .]?[1-9]'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not Basic Dolby Digital.yml b/regex_patterns/SQP - Not Basic Dolby Digital.yml
deleted file mode 100644
index 9a22c01..0000000
--- a/regex_patterns/SQP - Not Basic Dolby Digital.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not Basic Dolby Digital"
-pattern: '\bDD[^a-z+]|(?<!e-)\b(ac-?3)\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not DTS X.yml b/regex_patterns/SQP - Not DTS X.yml
deleted file mode 100644
index 0ebe08e..0000000
--- a/regex_patterns/SQP - Not DTS X.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not DTS X"
-pattern: '\b(dts[-_.: ]?x7?)\b(?![-_. ]?(26[456]))'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not DTS-ES.yml b/regex_patterns/SQP - Not DTS-ES.yml
deleted file mode 100644
index 8c4fbba..0000000
--- a/regex_patterns/SQP - Not DTS-ES.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: SQP - Not DTS-ES
-pattern: dts.?es
-description: ''
-tags: 
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not DTS-HD HRA-ES.yml b/regex_patterns/SQP - Not DTS-HD HRA-ES.yml
deleted file mode 100644
index 6aa5380..0000000
--- a/regex_patterns/SQP - Not DTS-HD HRA-ES.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not DTS-HD HRA/ES"
-pattern: 'dts[-. ]?(es|(hd[. ]?)?(hr|hi))'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not DTS-HD HRA_ES.yml b/regex_patterns/SQP - Not DTS-HD HRA_ES.yml
deleted file mode 100644
index 6aa5380..0000000
--- a/regex_patterns/SQP - Not DTS-HD HRA_ES.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not DTS-HD HRA/ES"
-pattern: 'dts[-. ]?(es|(hd[. ]?)?(hr|hi))'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not DTS-HD.yml b/regex_patterns/SQP - Not DTS-HD.yml
deleted file mode 100644
index 51ce52b..0000000
--- a/regex_patterns/SQP - Not DTS-HD.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not DTS-HD"
-pattern: '\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not DTS.yml b/regex_patterns/SQP - Not DTS.yml
deleted file mode 100644
index 518a93d..0000000
--- a/regex_patterns/SQP - Not DTS.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not DTS"
-pattern: '\bDTS(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not Dolby Digital Plus.yml b/regex_patterns/SQP - Not Dolby Digital Plus.yml
deleted file mode 100644
index 8c61222..0000000
--- a/regex_patterns/SQP - Not Dolby Digital Plus.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not Dolby Digital Plus"
-pattern: '\bDD[P+]|\b(e[-_. ]?ac-?3)\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not FLAC.yml b/regex_patterns/SQP - Not FLAC.yml
deleted file mode 100644
index f4840d2..0000000
--- a/regex_patterns/SQP - Not FLAC.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not FLAC"
-pattern: '\bFLAC(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not PCM.yml b/regex_patterns/SQP - Not PCM.yml
deleted file mode 100644
index 20526e7..0000000
--- a/regex_patterns/SQP - Not PCM.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not PCM"
-pattern: '\b(l?)PCM(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not RlsGrp (Atmos Only).yml b/regex_patterns/SQP - Not RlsGrp (Atmos Only).yml
deleted file mode 100644
index 0d362d7..0000000
--- a/regex_patterns/SQP - Not RlsGrp (Atmos Only).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not RlsGrp (Atmos Only)"
-pattern: '\b(W4NK3R|HQMUX)\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not RlsGrp (TrueHD only).yml b/regex_patterns/SQP - Not RlsGrp (TrueHD only).yml
deleted file mode 100644
index 304e4ad..0000000
--- a/regex_patterns/SQP - Not RlsGrp (TrueHD only).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not RlsGrp (TrueHD only)"
-pattern: '\b(CtrlHD|W4NK3R|DON)\b'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not TrueHD-ATMOS1.yml b/regex_patterns/SQP - Not TrueHD-ATMOS1.yml
deleted file mode 100644
index 3f53732..0000000
--- a/regex_patterns/SQP - Not TrueHD-ATMOS1.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not TrueHD/ATMOS1"
-pattern: 'True[ .-]?HD|\bATMOS(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - Not TrueHD-ATMOS2.yml b/regex_patterns/SQP - Not TrueHD-ATMOS2.yml
deleted file mode 100644
index d649d2e..0000000
--- a/regex_patterns/SQP - Not TrueHD-ATMOS2.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not TrueHD/ATMOS2"
-pattern: '\b(True[ .-]?HD|ATMOS|DDPA)(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - Not TrueHD.yml b/regex_patterns/SQP - Not TrueHD.yml
deleted file mode 100644
index 738e836..0000000
--- a/regex_patterns/SQP - Not TrueHD.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - Not TrueHD"
-pattern: 'True[ .-]?HD'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - PCM.yml b/regex_patterns/SQP - PCM.yml
deleted file mode 100644
index 22895fe..0000000
--- a/regex_patterns/SQP - PCM.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - PCM"
-pattern: '\b(l?)PCM(\b|\d)'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - TrueHD1.yml b/regex_patterns/SQP - TrueHD1.yml
deleted file mode 100644
index 78b46ba..0000000
--- a/regex_patterns/SQP - TrueHD1.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - TrueHD1"
-pattern: 'True[ .-]?HD|W4NK3R|HQMUX'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - TrueHD2.yml b/regex_patterns/SQP - TrueHD2.yml
deleted file mode 100644
index 19a99f4..0000000
--- a/regex_patterns/SQP - TrueHD2.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - TrueHD2"
-pattern: 'True[ .-]?HD'
-description: ''
-tags:
-- Audio
-- TRaSH
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SQP - hallowed.yml b/regex_patterns/SQP - hallowed.yml
deleted file mode 100644
index f126014..0000000
--- a/regex_patterns/SQP - hallowed.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "SQP - hallowed"
-pattern: "^(hallowed)$"
-description: ''
-tags:
-- Release Group
-- TRaSH
-tests: []
diff --git a/regex_patterns/SQP - x265_HEVC.yml b/regex_patterns/SQP - x265_HEVC.yml
deleted file mode 100644
index ddbe425..0000000
--- a/regex_patterns/SQP - x265_HEVC.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SQP - x265/HEVC'
-pattern: '[xh][ ._-]?265|\\bHEVC(\\b|\\d)'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SRLS.yml b/regex_patterns/SRLS.yml
deleted file mode 100644
index e9d8a75..0000000
--- a/regex_patterns/SRLS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SRLS'
-pattern: \b(SRLS)\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/SRW.yml b/regex_patterns/SRW.yml
deleted file mode 100644
index db1718f..0000000
--- a/regex_patterns/SRW.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SRW'
-pattern: \b(SRW)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SSA.yml b/regex_patterns/SSA.yml
deleted file mode 100644
index 8e78660..0000000
--- a/regex_patterns/SSA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SSA'
-pattern: \b(SSA)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/STRiFE.yml b/regex_patterns/STRiFE.yml
deleted file mode 100644
index dc2e166..0000000
--- a/regex_patterns/STRiFE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'STRiFE'
-pattern: \[STRiFE\]|-STRiFE\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/STRiKES (1).yml b/regex_patterns/STRiKES (1).yml
deleted file mode 100644
index 132007b..0000000
--- a/regex_patterns/STRiKES (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'STRiKES'
-'pattern': '(?<=^|[\s.-])STRiKES\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/STRiKES.yml b/regex_patterns/STRiKES.yml
index 30665c8..32d10db 100644
--- a/regex_patterns/STRiKES.yml
+++ b/regex_patterns/STRiKES.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])STRiKES\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/STUTTERSHIT (1).yml b/regex_patterns/STUTTERSHIT (1).yml
deleted file mode 100644
index 34a4c3c..0000000
--- a/regex_patterns/STUTTERSHIT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'STUTTERSHIT'
-'pattern': '(?<=^|[\s.-])STUTTERSHIT\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/STUTTERSHIT.yml b/regex_patterns/STUTTERSHIT.yml
index 355c4a3..9956e1d 100644
--- a/regex_patterns/STUTTERSHIT.yml
+++ b/regex_patterns/STUTTERSHIT.yml
@@ -1,6 +1,7 @@
 name: STUTTERSHIT
-pattern: ^(STUTTERSHIT)$
+pattern: (?<=^|[\s.-])STUTTERSHIT\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SUNSCREEN.yml b/regex_patterns/SUNSCREEN.yml
deleted file mode 100644
index d9ccb3d..0000000
--- a/regex_patterns/SUNSCREEN.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: SUNSCREEN
-pattern: ^(SUNSCREEN)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/SURCODE (1).yml b/regex_patterns/SURCODE (1).yml
deleted file mode 100644
index 261101c..0000000
--- a/regex_patterns/SURCODE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SURCODE'
-'pattern': '(?<=^|[\s.-])SURCODE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SURCODE.yml b/regex_patterns/SURCODE.yml
index 7c8179f..17fb974 100644
--- a/regex_patterns/SURCODE.yml
+++ b/regex_patterns/SURCODE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SURCODE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SWAGGERUHD (1).yml b/regex_patterns/SWAGGERUHD (1).yml
deleted file mode 100644
index 4067fa9..0000000
--- a/regex_patterns/SWAGGERUHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SWAGGERUHD'
-'pattern': '(?<=^|[\s.-])SWAGGERUHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SWAGGERUHD.yml b/regex_patterns/SWAGGERUHD.yml
index 66c9c80..2a2a184 100644
--- a/regex_patterns/SWAGGERUHD.yml
+++ b/regex_patterns/SWAGGERUHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SWAGGERUHD\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SWTYBLZ (1).yml b/regex_patterns/SWTYBLZ (1).yml
deleted file mode 100644
index 4165909..0000000
--- a/regex_patterns/SWTYBLZ (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SWTYBLZ'
-'pattern': '(?<=^|[\s.-])SWTYBLZ\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SWTYBLZ.yml b/regex_patterns/SWTYBLZ.yml
index c2aa887..4d0a5cd 100644
--- a/regex_patterns/SWTYBLZ.yml
+++ b/regex_patterns/SWTYBLZ.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SWTYBLZ\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/SaNcTi (1).yml b/regex_patterns/SaNcTi (1).yml
deleted file mode 100644
index e742b38..0000000
--- a/regex_patterns/SaNcTi (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SaNcTi'
-'pattern': '(?<=^|[\s.-])SaNcTi\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SaNcTi.yml b/regex_patterns/SaNcTi.yml
index 1c93ba6..3391484 100644
--- a/regex_patterns/SaNcTi.yml
+++ b/regex_patterns/SaNcTi.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SaNcTi\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Saizen (1).yml b/regex_patterns/Saizen (1).yml
deleted file mode 100644
index d6f07b7..0000000
--- a/regex_patterns/Saizen (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Saizen'
-'pattern': '(?<=^|[\s.-])Saizen\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Saizen.yml b/regex_patterns/Saizen.yml
index ad35c3f..e5d3455 100644
--- a/regex_patterns/Saizen.yml
+++ b/regex_patterns/Saizen.yml
@@ -1,6 +1,7 @@
-name: 'Saizen'
-pattern: \b(Saizen)\b
+name: Saizen
+pattern: (?<=^|[\s.-])Saizen\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Salieri.yml b/regex_patterns/Salieri.yml
deleted file mode 100644
index 43b2f7b..0000000
--- a/regex_patterns/Salieri.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Salieri'
-pattern: \b(Salieri)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SallySubs (1).yml b/regex_patterns/SallySubs (1).yml
deleted file mode 100644
index 57dfb84..0000000
--- a/regex_patterns/SallySubs (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SallySubs'
-'pattern': '(?<=^|[\s.-])SallySubs\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/SallySubs.yml b/regex_patterns/SallySubs.yml
index ba596f4..3da1a66 100644
--- a/regex_patterns/SallySubs.yml
+++ b/regex_patterns/SallySubs.yml
@@ -1,6 +1,7 @@
-name: 'SallySubs'
-pattern: \b(SallySubs)\b
+name: SallySubs
+pattern: (?<=^|[\s.-])SallySubs\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Samir755.yml b/regex_patterns/Samir755.yml
deleted file mode 100644
index 62fdb3f..0000000
--- a/regex_patterns/Samir755.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Samir755'
-pattern: \b(Samir755)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SanKyuu.yml b/regex_patterns/SanKyuu.yml
deleted file mode 100644
index baac34c..0000000
--- a/regex_patterns/SanKyuu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SanKyuu'
-pattern: \b(SanKyuu)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SasukeducK (1).yml b/regex_patterns/SasukeducK (1).yml
deleted file mode 100644
index c98b53e..0000000
--- a/regex_patterns/SasukeducK (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'SasukeducK'
-'pattern': '(?<=^|[\s.-])SasukeducK\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/SasukeducK.yml b/regex_patterns/SasukeducK.yml
index 39f8158..47962e4 100644
--- a/regex_patterns/SasukeducK.yml
+++ b/regex_patterns/SasukeducK.yml
@@ -1,6 +1,7 @@
-name: 'SasukeducK'
-pattern: '^(SasukeducK)$'
-description: ''
+name: SasukeducK
+pattern: (?<=^|[\s.-])SasukeducK\b
+description: Banned for Fake DV/HDR Layer
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/SbR (1).yml b/regex_patterns/SbR (1).yml
deleted file mode 100644
index 3327292..0000000
--- a/regex_patterns/SbR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SbR'
-'pattern': '(?<=^|[\s.-])SbR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SbR.yml b/regex_patterns/SbR.yml
index b48c699..3db4f6b 100644
--- a/regex_patterns/SbR.yml
+++ b/regex_patterns/SbR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SbR\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Scene (1).yml b/regex_patterns/Scene (1).yml
deleted file mode 100644
index f75b1f4..0000000
--- a/regex_patterns/Scene (1).yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-'description': 'Matches Scene Groups'
-'name': 'Scene'
-'pattern': '(?<=^|[\s.-])SPARKS|DRONES|ROVERS|SPRINTER|GECKOS|SHORTBREHD|EDITH|FilmHD|POW4HD|HD4U|TENEIGHTY|ETHEL\b'
-'tags': []
-'tests': []
diff --git a/regex_patterns/Scriptum.yml b/regex_patterns/Scriptum.yml
deleted file mode 100644
index c1ece6c..0000000
--- a/regex_patterns/Scriptum.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Scriptum'
-pattern: \b(Scriptum)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Scryous-Raws.yml b/regex_patterns/Scryous-Raws.yml
deleted file mode 100644
index 8329594..0000000
--- a/regex_patterns/Scryous-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Scryous-Raws'
-pattern: Scryous[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Seicher-Raws.yml b/regex_patterns/Seicher-Raws.yml
deleted file mode 100644
index d142320..0000000
--- a/regex_patterns/Seicher-Raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Seicher-Raws'
-pattern: Seicher[ ._-]?(Raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Senjou (1).yml b/regex_patterns/Senjou (1).yml
deleted file mode 100644
index 99e2b73..0000000
--- a/regex_patterns/Senjou (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Senjou'
-'pattern': '(?<=^|[\s.-])Senjou\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Senjou.yml b/regex_patterns/Senjou.yml
index 54c32ab..383cf95 100644
--- a/regex_patterns/Senjou.yml
+++ b/regex_patterns/Senjou.yml
@@ -1,6 +1,7 @@
-name: 'Senjou'
-pattern: \[Senjou\]|-Senjou\b
+name: Senjou
+pattern: (?<=^|[\s.-])Senjou\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Setsugen.yml b/regex_patterns/Setsugen.yml
deleted file mode 100644
index 417b60d..0000000
--- a/regex_patterns/Setsugen.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Setsugen
-pattern: \b(Setsugen)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ShadyCrab.yml b/regex_patterns/ShadyCrab.yml
deleted file mode 100644
index 69e771a..0000000
--- a/regex_patterns/ShadyCrab.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ShadyCrab'
-pattern: \b(ShadyCrab)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ShieldBearer (1).yml b/regex_patterns/ShieldBearer (1).yml
deleted file mode 100644
index bc3a7e9..0000000
--- a/regex_patterns/ShieldBearer (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned For AI Upscale'
-'name': 'ShieldBearer'
-'pattern': '(?<=^|[\s.-])ShieldBearer\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/ShieldBearer.yml b/regex_patterns/ShieldBearer.yml
index 30ad56b..3a4de3e 100644
--- a/regex_patterns/ShieldBearer.yml
+++ b/regex_patterns/ShieldBearer.yml
@@ -1,6 +1,7 @@
 name: ShieldBearer
-pattern: ^(ShieldBearer)$
-description: ''
+pattern: (?<=^|[\s.-])ShieldBearer\b
+description: Banned For AI Upscale
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/Shimatta.yml b/regex_patterns/Shimatta.yml
deleted file mode 100644
index 684821a..0000000
--- a/regex_patterns/Shimatta.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Shimatta
-pattern: \b(Shimatta)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ShowY.yml b/regex_patterns/ShowY.yml
deleted file mode 100644
index 0aa1ef3..0000000
--- a/regex_patterns/ShowY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ShowY'
-pattern: \b(ShowY)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Showtime Rename.yml b/regex_patterns/Showtime Rename.yml
index 898e1f5..af2e952 100644
--- a/regex_patterns/Showtime Rename.yml	
+++ b/regex_patterns/Showtime Rename.yml	
@@ -1,13 +1,13 @@
-'description': 'Showtime (also known as Paramount+ with Showtime) is an American premium
+name: Showtime Rename
+pattern: \[(SHO)\b|\b(SHO)\]
+description: Showtime (also known as Paramount+ with Showtime) is an American premium
   television network and the flagship property of Showtime Networks, a sub-division
-  of the Paramount Media Networks division of Paramount Global. Showtime''s programming
+  of the Paramount Media Networks division of Paramount Global. Showtime's programming
   includes original television series produced exclusively for the linear network
   and developed for the co-owned Paramount+ streaming service, theatrically released
   and independent motion pictures, documentaries, and occasional stand-up comedy specials,
-  made-for-TV movies, and softcore adult programming.'
-'name': 'Showtime Rename'
-'pattern': '\[(SHO)\b|\b(SHO)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+  made-for-TV movies, and softcore adult programming.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Showtime.yml b/regex_patterns/Showtime.yml
index cc48897..43ede52 100644
--- a/regex_patterns/Showtime.yml
+++ b/regex_patterns/Showtime.yml
@@ -1,13 +1,13 @@
-'description': 'Showtime (also known as Paramount+ with Showtime) is an American premium
+name: Showtime
+pattern: \b(sho|showtime)\b[ ._-]web[ ._-]?(dl|rip)?\b
+description: Showtime (also known as Paramount+ with Showtime) is an American premium
   television network and the flagship property of Showtime Networks, a sub-division
-  of the Paramount Media Networks division of Paramount Global. Showtime''s programming
+  of the Paramount Media Networks division of Paramount Global. Showtime's programming
   includes original television series produced exclusively for the linear network
   and developed for the co-owned Paramount+ streaming service, theatrically released
   and independent motion pictures, documentaries, and occasional stand-up comedy specials,
-  made-for-TV movies, and softcore adult programming.'
-'name': 'Showtime'
-'pattern': '\b(sho|showtime)\b[ ._-]web[ ._-]?(dl|rip)?\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+  made-for-TV movies, and softcore adult programming.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/SiC (1).yml b/regex_patterns/SiC (1).yml
deleted file mode 100644
index af93ae1..0000000
--- a/regex_patterns/SiC (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SiC'
-'pattern': '(?<=^|[\s.-])SiC\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/SiC.yml b/regex_patterns/SiC.yml
index 0b68d59..8791b49 100644
--- a/regex_patterns/SiC.yml
+++ b/regex_patterns/SiC.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SiC\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/SiCFoI (1).yml b/regex_patterns/SiCFoI (1).yml
deleted file mode 100644
index e9bd29c..0000000
--- a/regex_patterns/SiCFoI (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SiCFoI'
-'pattern': '(?<=^|[\s.-])SiCFoI\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/SiCFoI.yml b/regex_patterns/SiCFoI.yml
index fd480a5..986d600 100644
--- a/regex_patterns/SiCFoI.yml
+++ b/regex_patterns/SiCFoI.yml
@@ -1,6 +1,7 @@
-name: 'SiCFoI'
-pattern: ^(SiCFoI)$
+name: SiCFoI
+pattern: (?<=^|[\s.-])SiCFoI\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/SiGLA (1).yml b/regex_patterns/SiGLA (1).yml
deleted file mode 100644
index 2185290..0000000
--- a/regex_patterns/SiGLA (1).yml	
+++ /dev/null
@@ -1,17 +0,0 @@
-'description': ''
-'name': 'SiGLA'
-'pattern': '(?<=^|[\s.-])SiGLA\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Full.Metal.Jacket.1987.1080p.HMAX.WEB-DL.DD5.1.HEVC-SiGLA.mkv'
-  'lastRun': '2024-12-11T05:23:38.079493'
-  'matchSpan':
-    'end': 57
-    'start': 52
-  'matchedContent': 'SiGLA'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/SiGLA.yml b/regex_patterns/SiGLA.yml
index 54fb937..ea6f3a1 100644
--- a/regex_patterns/SiGLA.yml
+++ b/regex_patterns/SiGLA.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])SiGLA\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/SiGMA (1).yml b/regex_patterns/SiGMA (1).yml
deleted file mode 100644
index 1eaffeb..0000000
--- a/regex_patterns/SiGMA (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SiGMA'
-'pattern': '(?<=^|[\s.-])SiGMA\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/SiGMA.yml b/regex_patterns/SiGMA.yml
index 3ea754d..296932b 100644
--- a/regex_patterns/SiGMA.yml
+++ b/regex_patterns/SiGMA.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SiGMA\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/SiMPLE (1).yml b/regex_patterns/SiMPLE (1).yml
deleted file mode 100644
index 07a99f4..0000000
--- a/regex_patterns/SiMPLE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SiMPLE'
-'pattern': '(?<=^|[\s.-])SiMPLE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SiMPLE.yml b/regex_patterns/SiMPLE.yml
index 2d62109..0424a46 100644
--- a/regex_patterns/SiMPLE.yml
+++ b/regex_patterns/SiMPLE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SiMPLE\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Sing Along (1).yml b/regex_patterns/Sing Along (1).yml
deleted file mode 100644
index 3791b38..0000000
--- a/regex_patterns/Sing Along (1).yml	
+++ /dev/null
@@ -1,19 +0,0 @@
-'description': 'Matches "Sing Along" releases when `Sing Along` is preceded by a year
-
-  - Ensures that `Sing Along` is not matched in the movie title'
-'name': 'Sing Along'
-'pattern': '(?<=\b[12]\d{3}\b).*\b(Sing[-_. ]Along)\b'
-'tags':
-- 'Edition'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Wicked 2024 Sing-Along Version 720p MA WEB-DL DDP 5.1 H.264-FLUX'
-  'lastRun': '2025-02-26T04:53:02.368189'
-  'matchSpan':
-    'end': 22
-    'start': 11
-  'matchedContent': ' Sing-Along'
-  'matchedGroups':
-  - 'Sing-Along'
-  'passes': true
diff --git a/regex_patterns/Slyfox.yml b/regex_patterns/Slyfox.yml
deleted file mode 100644
index b087031..0000000
--- a/regex_patterns/Slyfox.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Slyfox'
-pattern: \b(Slyfox)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Smoke.yml b/regex_patterns/Smoke.yml
deleted file mode 100644
index b29cabe..0000000
--- a/regex_patterns/Smoke.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Smoke
-pattern: \[Smoke\]|-Smoke\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SmugCat.yml b/regex_patterns/SmugCat.yml
deleted file mode 100644
index 3b1a16b..0000000
--- a/regex_patterns/SmugCat.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SmugCat'
-pattern: \b(SmugCat)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SoLCE.yml b/regex_patterns/SoLCE.yml
deleted file mode 100644
index d17d551..0000000
--- a/regex_patterns/SoLCE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SoLCE'
-pattern: \b(SoLCE)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SoLaR (1).yml b/regex_patterns/SoLaR (1).yml
deleted file mode 100644
index 44671ce..0000000
--- a/regex_patterns/SoLaR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SoLaR'
-'pattern': '(?<=^|[\s.-])SoLaR\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/SoLaR.yml b/regex_patterns/SoLaR.yml
index d6ef46f..0c92859 100644
--- a/regex_patterns/SoLaR.yml
+++ b/regex_patterns/SoLaR.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SoLaR\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Soldado.yml b/regex_patterns/Soldado.yml
deleted file mode 100644
index cf1e1e0..0000000
--- a/regex_patterns/Soldado.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Soldado'
-pattern: \[Soldado\]|-Soldado\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Spark.yml b/regex_patterns/Spark.yml
deleted file mode 100644
index 08b3307..0000000
--- a/regex_patterns/Spark.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Spark'
-pattern: \[Spark\]|-Spark\b
-description: ''
-tags:
-- Release Group
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/Special Edition (1).yml b/regex_patterns/Special Edition (1).yml
deleted file mode 100644
index e8ec858..0000000
--- a/regex_patterns/Special Edition (1).yml	
+++ /dev/null
@@ -1,280 +0,0 @@
-'description': 'Matches any type of non theatrical edition. '
-'name': 'Special Edition'
-'pattern': '(?<!^|{)\b(extended|uncut|directors|special|unrated|uncensored|cut|version|edition)(\b|\d)'
-'tags':
-- 'Edition'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Zenimation.S01.Extended.Edition.720p.DSNP.WEB-DL.DDP5.1.H.264-LAZY'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 23
-    'start': 15
-  'matchedContent': 'Extended'
-  'matchedGroups':
-  - 'Extended'
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Vikings Extended S05 1080p BluRay REMUX AVC DTS-HD MA 5.1-FraMeSToR'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 16
-    'start': 8
-  'matchedContent': 'Extended'
-  'matchedGroups':
-  - 'Extended'
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'My Very Extended Family'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 16
-    'start': 8
-  'matchedContent': 'Extended'
-  'matchedGroups':
-  - 'Extended'
-  - ''
-  'passes': false
-- 'expected': false
-  'id': 4
-  'input': 'Pente lepta akoma AKA Extended Play'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 30
-    'start': 22
-  'matchedContent': 'Extended'
-  'matchedGroups':
-  - 'Extended'
-  - ''
-  'passes': false
-- 'expected': false
-  'id': 5
-  'input': 'Uncut.2023.1080p.AMZN.WEB-DL.DDP2.0.H.264-LLL.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': 'The Punisher (1989) Remastered Uncut 1080p BluRay x265 SDR DDP 5.1 English-Ralphy'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 36
-    'start': 31
-  'matchedContent': 'Uncut'
-  'matchedGroups':
-  - 'Uncut'
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 7
-  'input': 'The Naked Director S01 2160p NF WEB-DL Dual-Audio DD+ 5.1 H.265-HONE'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'Midsommar.2019.PROPER.Directors.Cut.UHD.BluRay.1080p.DDP.5.1.DoVi.HDR10.x265-SM737.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 31
-    'start': 22
-  'matchedContent': 'Directors'
-  'matchedGroups':
-  - 'Directors'
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 9
-  'input': 'George.Michael.Freedom.Uncut.2022.1080p.AMZN.WEB-DL.DDP5.1.H.264-PTP.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 28
-    'start': 23
-  'matchedContent': 'Uncut'
-  'matchedGroups':
-  - 'Uncut'
-  - ''
-  'passes': false
-- 'expected': false
-  'id': 10
-  'input': 'Tupac.Uncensored.and.Uncut.The.Lost.Prison.Tapes.2011.DVDRip.x264-HANDJOB.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 16
-    'start': 6
-  'matchedContent': 'Uncensored'
-  'matchedGroups':
-  - 'Uncensored'
-  - ''
-  'passes': false
-- 'expected': false
-  'id': 11
-  'input': 'Friedkin.Uncut.2018.1080p.MUBI.WEB-DL.AAC2.0.H.264-BdC.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 14
-    'start': 9
-  'matchedContent': 'Uncut'
-  'matchedGroups':
-  - 'Uncut'
-  - ''
-  'passes': false
-- 'expected': false
-  'id': 12
-  'input': 'Sniper.Special.Ops.2016.720p.BluRay.DD5.1.x264-SpaceHD'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 14
-    'start': 7
-  'matchedContent': 'Special'
-  'matchedGroups':
-  - 'Special'
-  - ''
-  'passes': false
-- 'expected': true
-  'id': 13
-  'input': 'Revhead.Miduga.Special.Edition-SKIDROW'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 22
-    'start': 15
-  'matchedContent': 'Special'
-  'matchedGroups':
-  - 'Special'
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 14
-  'input': 'Pointless.Celebrities.S17E09.Special.720p.WEB-DL.AAC2.0.H.264-BTN'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 36
-    'start': 29
-  'matchedContent': 'Special'
-  'matchedGroups':
-  - 'Special'
-  - ''
-  'passes': false
-- 'expected': true
-  'id': 15
-  'input': 'Land of the Dead 2005 Unrated DC REPACK SHOUT 1080p UHD BluRay DD 5 1
-    Atmos DV HDR x265-SQS'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 29
-    'start': 22
-  'matchedContent': 'Unrated'
-  'matchedGroups':
-  - 'Unrated'
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 16
-  'input': 'Unrated: The Movie'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 17
-  'input': 'Who Framed Roger Rabbit 1988 Uncensored 1080p HDTV DD5.1 H.264.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 39
-    'start': 29
-  'matchedContent': 'Uncensored'
-  'matchedGroups':
-  - 'Uncensored'
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 18
-  'input': 'The Veil Uncensored S01 2021 1080p WEB-DL AAC 2.0 H.264-Solonese'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 19
-    'start': 9
-  'matchedContent': 'Uncensored'
-  'matchedGroups':
-  - 'Uncensored'
-  - ''
-  'passes': true
-- 'expected': false
-  'id': 19
-  'input': 'Uncensored 2018 S06E11 Tamela Mann 720p HDTV x264-CRiMSON'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 20
-  'input': 'Zodiac.2007.Directors.Cut.Bluray.1080p.TrueHD.5.1.AVC.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 21
-    'start': 12
-  'matchedContent': 'Directors'
-  'matchedGroups':
-  - 'Directors'
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 21
-  'input': 'X-Men Days of Future Past 2014 The Rogue Cut 2160p MA WEB-DL TrueHD 7
-    1 DV HDR10+ H 265-DRX'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 44
-    'start': 41
-  'matchedContent': 'Cut'
-  'matchedGroups':
-  - 'Cut'
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 22
-  'input': 'The.Wicker.Man.The.Final.Cut.1973.UHD.BluRay.2160p.FLAC.2.0.DV.HEVC.REMUX-FraMeSToR'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 28
-    'start': 25
-  'matchedContent': 'Cut'
-  'matchedGroups':
-  - 'Cut'
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 23
-  'input': 'Twin Peaks Alternate International Version 1989 720p BluRay DTD 5.1 x264-reward'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 42
-    'start': 35
-  'matchedContent': 'Version'
-  'matchedGroups':
-  - 'Version'
-  - ''
-  'passes': true
-- 'expected': true
-  'id': 24
-  'input': 'Trainspotting.1996.Collectors.Edition.1080P.BluRay.DD.5.1.X265-Ralphy.mkv'
-  'lastRun': '2025-02-26T04:33:39.532784'
-  'matchSpan':
-    'end': 37
-    'start': 30
-  'matchedContent': 'Edition'
-  'matchedGroups':
-  - 'Edition'
-  - ''
-  'passes': true
diff --git a/regex_patterns/Spirale.yml b/regex_patterns/Spirale.yml
deleted file mode 100644
index 74085ed..0000000
--- a/regex_patterns/Spirale.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Spirale
-pattern: \b(Spirale)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Stan Rename.yml b/regex_patterns/Stan Rename.yml
index 098b380..d6f9c4a 100644
--- a/regex_patterns/Stan Rename.yml	
+++ b/regex_patterns/Stan Rename.yml	
@@ -1,9 +1,9 @@
-'description': 'Stan is an Australian over-the-top streaming service. The service
-  offers a broad range of film and television content from both local and foreign
-  productions, particularly from the United States and United Kingdom.'
-'name': 'Stan Rename'
-'pattern': '\[(STAN)\b|\b(STAN)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+name: Stan Rename
+pattern: \[(STAN)\b|\b(STAN)\]
+description: Stan is an Australian over-the-top streaming service. The service offers
+  a broad range of film and television content from both local and foreign productions,
+  particularly from the United States and United Kingdom.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Stan.yml b/regex_patterns/Stan.yml
index 0e173a7..1522e5f 100644
--- a/regex_patterns/Stan.yml
+++ b/regex_patterns/Stan.yml
@@ -1,9 +1,9 @@
-'description': 'Stan is an Australian over-the-top streaming service. The service
-  offers a broad range of film and television content from both local and foreign
-  productions, particularly from the United States and United Kingdom.'
-'name': 'Stan'
-'pattern': '\b(stan)\b[ ._-]web[ ._-]?(dl|rip)?\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
+name: Stan
+pattern: \b(stan)\b[ ._-]web[ ._-]?(dl|rip)?\b
+description: Stan is an Australian over-the-top streaming service. The service offers
+  a broad range of film and television content from both local and foreign productions,
+  particularly from the United States and United Kingdom.
+tags:
+- Streaming Service
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Stereo.yml b/regex_patterns/Stereo.yml
deleted file mode 100644
index 1954c8b..0000000
--- a/regex_patterns/Stereo.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Stereo'
-pattern: '(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b'
-description: ''
-tags:
-- Release Group
-- Audio
-tests: []
\ No newline at end of file
diff --git a/regex_patterns/StrayGods.yml b/regex_patterns/StrayGods.yml
deleted file mode 100644
index b892a00..0000000
--- a/regex_patterns/StrayGods.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'StrayGods'
-pattern: \b(StrayGods)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SubsPlease (1).yml b/regex_patterns/SubsPlease (1).yml
deleted file mode 100644
index dd9a5bd..0000000
--- a/regex_patterns/SubsPlease (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SubsPlease'
-'pattern': '(?<=^|[\s.-])SubsPlease\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/SubsPlease.yml b/regex_patterns/SubsPlease.yml
index deec762..be2cbee 100644
--- a/regex_patterns/SubsPlease.yml
+++ b/regex_patterns/SubsPlease.yml
@@ -1,6 +1,7 @@
-name: 'SubsPlease'
-pattern: \b(SubsPlease)\b
+name: SubsPlease
+pattern: (?<=^|[\s.-])SubsPlease\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/SubsPlus+ (1).yml b/regex_patterns/SubsPlus+ (1).yml
deleted file mode 100644
index c316880..0000000
--- a/regex_patterns/SubsPlus+ (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SubsPlus+'
-'pattern': '(?<=^|[\s.-])SubsPlus+\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/SubsPlus+.yml b/regex_patterns/SubsPlus+.yml
index 5232922..1410bf9 100644
--- a/regex_patterns/SubsPlus+.yml
+++ b/regex_patterns/SubsPlus+.yml
@@ -1,6 +1,7 @@
-name: 'SubsPlus+'
-pattern: \b(SubsPlus\+?)\b
+name: SubsPlus+
+pattern: (?<=^|[\s.-])SubsPlus+\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Suki_Desu.yml b/regex_patterns/Suki_Desu.yml
deleted file mode 100644
index f4e7fb3..0000000
--- a/regex_patterns/Suki_Desu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Suki Desu'
-pattern: \[Suki[ .-]?Desu\]|-Suki[ .-]?Desu\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SumVision (1).yml b/regex_patterns/SumVision (1).yml
deleted file mode 100644
index 478f3c2..0000000
--- a/regex_patterns/SumVision (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'SumVision'
-'pattern': '(?<=^|[\s.-])SumVision\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/SumVision.yml b/regex_patterns/SumVision.yml
index 639785a..87c9670 100644
--- a/regex_patterns/SumVision.yml
+++ b/regex_patterns/SumVision.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])SumVision\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Remux
+tests: []
diff --git a/regex_patterns/Sushi.yml b/regex_patterns/Sushi.yml
deleted file mode 100644
index 114ab7e..0000000
--- a/regex_patterns/Sushi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Sushi'
-pattern: \[Sushi\]|-Sushi\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/SwAgLaNdEr.yml b/regex_patterns/SwAgLaNdEr.yml
deleted file mode 100644
index f138b54..0000000
--- a/regex_patterns/SwAgLaNdEr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'SwAgLaNdEr'
-pattern: '^(SwAgLaNdEr)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/T4H.yml b/regex_patterns/T4H.yml
deleted file mode 100644
index 1d6400c..0000000
--- a/regex_patterns/T4H.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: T4H
-pattern: ^(T4H)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/T6D.yml b/regex_patterns/T6D.yml
deleted file mode 100644
index 4c79773..0000000
--- a/regex_patterns/T6D.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'T6D'
-pattern: ^(T6D)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/TAoE.yml b/regex_patterns/TAoE.yml
index 6159d29..7177dc5 100644
--- a/regex_patterns/TAoE.yml
+++ b/regex_patterns/TAoE.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'TAoE'
-'pattern': '(?<=^|[\s.-])TAoE|Goki|Frys|JBENT|DNU|Ainz|TheSickle|ANONAZ|Species180|r0b0t|xtrem3x|HxD|ArcX|WEM|Nostradamus|Erie|DUHIT|jb2049|DrainedDay|AJJMIN\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: TAoE
+pattern: (?<=^|[\s.-])TAoE|Goki|Frys|JBENT|DNU|Ainz|TheSickle|ANONAZ|Species180|r0b0t|xtrem3x|HxD|ArcX|WEM|Nostradamus|Erie|DUHIT|jb2049|DrainedDay|AJJMIN\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/TBB (1).yml b/regex_patterns/TBB (1).yml
deleted file mode 100644
index 476d217..0000000
--- a/regex_patterns/TBB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TBB'
-'pattern': '(?<=^|[\s.-])TBB\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/TBB.yml b/regex_patterns/TBB.yml
index 21de7fe..120b90d 100644
--- a/regex_patterns/TBB.yml
+++ b/regex_patterns/TBB.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])TBB\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/TBS.yml b/regex_patterns/TBS.yml
deleted file mode 100644
index dac9e44..0000000
--- a/regex_patterns/TBS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: TBS
-pattern: ^(TBS)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/TDD (1).yml b/regex_patterns/TDD (1).yml
deleted file mode 100644
index 750d654..0000000
--- a/regex_patterns/TDD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TDD'
-'pattern': '(?<=^|[\s.-])TDD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/TDD.yml b/regex_patterns/TDD.yml
index 4a1206d..41ad5da 100644
--- a/regex_patterns/TDD.yml
+++ b/regex_patterns/TDD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])TDD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/TEKNO3D (1).yml b/regex_patterns/TEKNO3D (1).yml
deleted file mode 100644
index fe911de..0000000
--- a/regex_patterns/TEKNO3D (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'TEKNO3D'
-'pattern': '(?<=^|[\s.-])TEKNO3D\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/TEKNO3D.yml b/regex_patterns/TEKNO3D.yml
index 345da59..e6a6a00 100644
--- a/regex_patterns/TEKNO3D.yml
+++ b/regex_patterns/TEKNO3D.yml
@@ -1,6 +1,7 @@
-name: 'TEKNO3D'
-pattern: '\\b(TEKNO3D)\\b'
-description: ''
+name: TEKNO3D
+pattern: (?<=^|[\s.-])TEKNO3D\b
+description: Banned for Fake DV/HDR Layer
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/TENEIGHTY.yml b/regex_patterns/TENEIGHTY.yml
deleted file mode 100644
index c74b983..0000000
--- a/regex_patterns/TENEIGHTY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'TENEIGHTY'
-pattern: \b(TENEIGHTY)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/TEPES (1).yml b/regex_patterns/TEPES (1).yml
deleted file mode 100644
index 08379dd..0000000
--- a/regex_patterns/TEPES (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TEPES'
-'pattern': '(?<=^|[\s.-])TEPES\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/TEPES.yml b/regex_patterns/TEPES.yml
index a488bf1..5598613 100644
--- a/regex_patterns/TEPES.yml
+++ b/regex_patterns/TEPES.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])TEPES\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/TERMiNAL (1).yml b/regex_patterns/TERMiNAL (1).yml
deleted file mode 100644
index 96b0234..0000000
--- a/regex_patterns/TERMiNAL (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TERMiNAL'
-'pattern': '(?<=^|[\s.-])TERMiNAL\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/TERMiNAL.yml b/regex_patterns/TERMiNAL.yml
index 57244e6..3e1f9fa 100644
--- a/regex_patterns/TERMiNAL.yml
+++ b/regex_patterns/TERMiNAL.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])TERMiNAL\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/THORA (1).yml b/regex_patterns/THORA (1).yml
deleted file mode 100644
index 5ba67e7..0000000
--- a/regex_patterns/THORA (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'THORA'
-'pattern': '(?<=^|[\s.-])THORA\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/THORA.yml b/regex_patterns/THORA.yml
index 4414cb1..b15baf4 100644
--- a/regex_patterns/THORA.yml
+++ b/regex_patterns/THORA.yml
@@ -1,6 +1,7 @@
-name: 'THORA'
-pattern: \b(THORA)\b
+name: THORA
+pattern: (?<=^|[\s.-])THORA\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/THREESOME (1).yml b/regex_patterns/THREESOME (1).yml
deleted file mode 100644
index 9981a38..0000000
--- a/regex_patterns/THREESOME (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'THREESOME'
-'pattern': '(?<=^|[\s.-])THREESOME\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/THREESOME.yml b/regex_patterns/THREESOME.yml
index 29435c3..52ca340 100644
--- a/regex_patterns/THREESOME.yml
+++ b/regex_patterns/THREESOME.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])THREESOME\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/TIKO.yml b/regex_patterns/TIKO.yml
deleted file mode 100644
index 2e53ba2..0000000
--- a/regex_patterns/TIKO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: TIKO
-pattern: ^(TIKO)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/TOMBCRUISE (1).yml b/regex_patterns/TOMBCRUISE (1).yml
deleted file mode 100644
index 20c2d26..0000000
--- a/regex_patterns/TOMBCRUISE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TOMBCRUISE'
-'pattern': '(?<=^|[\s.-])TOMBCRUISE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/TOMBCRUISE.yml b/regex_patterns/TOMBCRUISE.yml
index 39253ea..dd161c0 100644
--- a/regex_patterns/TOMBCRUISE.yml
+++ b/regex_patterns/TOMBCRUISE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])TOMBCRUISE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/TOMMY (1).yml b/regex_patterns/TOMMY (1).yml
deleted file mode 100644
index f3fe0b8..0000000
--- a/regex_patterns/TOMMY (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "TOMMY" when preceded by whitespace, a hyphen or dot'
-'name': 'TOMMY'
-'pattern': '(?<=^|[\s.-])TOMMY\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/TOMMY.yml b/regex_patterns/TOMMY.yml
index 89004b6..ec2d888 100644
--- a/regex_patterns/TOMMY.yml
+++ b/regex_patterns/TOMMY.yml
@@ -1,6 +1,7 @@
-name: 'TOMMY'
-pattern: '^(TOMMY)$'
-description: ''
+name: TOMMY
+pattern: (?<=^|[\s.-])TOMMY\b
+description: Matches "TOMMY" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/TOPKEK.yml b/regex_patterns/TOPKEK.yml
deleted file mode 100644
index 3b59699..0000000
--- a/regex_patterns/TOPKEK.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'TOPKEK'
-pattern: \b(TOPKEK)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/TRiToN (1).yml b/regex_patterns/TRiToN (1).yml
deleted file mode 100644
index a5390da..0000000
--- a/regex_patterns/TRiToN (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TRiToN'
-'pattern': '(?<=^|[\s.-])TRiToN\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/TRiToN.yml b/regex_patterns/TRiToN.yml
index ce81cf7..fa9850c 100644
--- a/regex_patterns/TRiToN.yml
+++ b/regex_patterns/TRiToN.yml
@@ -1,6 +1,7 @@
-name: 'TRiToN'
-pattern: ^(TRiToN)$
+name: TRiToN
+pattern: (?<=^|[\s.-])TRiToN\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/TTGA (1).yml b/regex_patterns/TTGA (1).yml
deleted file mode 100644
index 117499e..0000000
--- a/regex_patterns/TTGA (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TTGA'
-'pattern': '(?<=^|[\s.-])TTGA\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/TTGA.yml b/regex_patterns/TTGA.yml
index adb4df1..b9b5440 100644
--- a/regex_patterns/TTGA.yml
+++ b/regex_patterns/TTGA.yml
@@ -1,6 +1,7 @@
-name: 'TTGA'
-pattern: \b(TTGA)\b
+name: TTGA
+pattern: (?<=^|[\s.-])TTGA\b
 description: ''
 tags:
 - Release Group
-tests: []
\ No newline at end of file
+- Anime
+tests: []
diff --git a/regex_patterns/TUSAHD.yml b/regex_patterns/TUSAHD.yml
deleted file mode 100644
index 5a1cd6f..0000000
--- a/regex_patterns/TUSAHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: TUSAHD
-pattern: (?<=^|[\s.-])TUSAHD\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/TVING (1).yml b/regex_patterns/TVING (1).yml
deleted file mode 100644
index 2dcd95b..0000000
--- a/regex_patterns/TVING (1).yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-'description': 'TVING is a South Korean subscription video on-demand over-the-top
-  streaming service operated by TVING Corporation, a joint venture made of CJ ENM
-  Entertainment Division, Naver and JTBC by its JTBC Studios, now called SLL.'
-'name': 'TVING'
-'pattern': '\b(TVING)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/TVING.yml b/regex_patterns/TVING.yml
index 259d315..e8359bb 100644
--- a/regex_patterns/TVING.yml
+++ b/regex_patterns/TVING.yml
@@ -1,7 +1,9 @@
 name: TVING
 pattern: \b(TVING)\b
-description: TVING is a South Korean subscription video on-demand over-the-top streaming service operated by TVING Corporation, a joint venture made of CJ ENM Entertainment Division, Naver and JTBC by its JTBC Studios, now called SLL.
+description: TVING is a South Korean subscription video on-demand over-the-top streaming
+  service operated by TVING Corporation, a joint venture made of CJ ENM Entertainment
+  Division, Naver and JTBC by its JTBC Studios, now called SLL.
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests: []
diff --git a/regex_patterns/TVSmash.yml b/regex_patterns/TVSmash.yml
deleted file mode 100644
index 0b84cd7..0000000
--- a/regex_patterns/TVSmash.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: TVSmash
-pattern: ^(TVSmash)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/TayTo (1).yml b/regex_patterns/TayTo (1).yml
deleted file mode 100644
index 6c9636e..0000000
--- a/regex_patterns/TayTo (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TayTo'
-'pattern': '(?<=^|[\s.-])TayTo\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/TayTo.yml b/regex_patterns/TayTo.yml
index d37b154..a04fee8 100644
--- a/regex_patterns/TayTo.yml
+++ b/regex_patterns/TayTo.yml
@@ -1,6 +1,7 @@
-name: TayTO
+name: TayTo
 pattern: (?<=^|[\s.-])TayTo\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/TeamTurquoize.yml b/regex_patterns/TeamTurquoize.yml
deleted file mode 100644
index ee22ac3..0000000
--- a/regex_patterns/TeamTurquoize.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'TeamTurquoize'
-pattern: \b(TeamTurquoize)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/TeeWee.yml b/regex_patterns/TeeWee.yml
deleted file mode 100644
index eb8b291..0000000
--- a/regex_patterns/TeeWee.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'TeeWee'
-pattern: '\\b(TeeWee)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Telly.yml b/regex_patterns/Telly.yml
index 46b16da..3181f35 100644
--- a/regex_patterns/Telly.yml
+++ b/regex_patterns/Telly.yml
@@ -1,7 +1,7 @@
-'description': 'Banned for Retagging'
-'name': 'Telly'
-'pattern': '(?<=^|[\s.-])Telly\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: Telly
+pattern: (?<=^|[\s.-])Telly\b
+description: Banned for Retagging
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/Tenrai_Sensei.yml b/regex_patterns/Tenrai_Sensei.yml
deleted file mode 100644
index f77d8e4..0000000
--- a/regex_patterns/Tenrai_Sensei.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Tenrai Sensei'
-pattern: \b(Tenrai[ .-]?Sensei)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Tenshi.yml b/regex_patterns/Tenshi.yml
deleted file mode 100644
index 92bdecf..0000000
--- a/regex_patterns/Tenshi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Tenshi'
-pattern: \[tenshi\]|-tenshi$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ThD.yml b/regex_patterns/ThD.yml
deleted file mode 100644
index 0e1b93c..0000000
--- a/regex_patterns/ThD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ThD
-pattern: (?<=^|[\s.-])ThD\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Theatrical Edition (1).yml b/regex_patterns/Theatrical Edition (1).yml
deleted file mode 100644
index e65219e..0000000
--- a/regex_patterns/Theatrical Edition (1).yml	
+++ /dev/null
@@ -1,45 +0,0 @@
-'description': 'Matches any type of theatrical edition.
-
-  - Ensures that `Theatrical` comes after the year so that movies with ''Theatrical`
-  in the title are not matched'
-'name': 'Theatrical Edition'
-'pattern': '^(.*?)(\d{4})(.*?)\b(theatrical)\b'
-'tags':
-- 'Edition'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Zodiac.2007.Theatrical.UHD.BluRay.2160p.TrueHD.5.1.DV.HEVC.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-25T22:15:43.307902'
-  'matchSpan':
-    'end': 22
-    'start': 0
-  'matchedContent': 'Zodiac.2007.Theatrical'
-  'matchedGroups':
-  - 'Zodiac.'
-  - '2007'
-  - '.'
-  - 'Theatrical'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Theatrical.Movie.2007.Theatrical.UHD.BluRay.2160p.TrueHD.5.1.DV.HEVC.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-25T22:15:43.307902'
-  'matchSpan':
-    'end': 32
-    'start': 0
-  'matchedContent': 'Theatrical.Movie.2007.Theatrical'
-  'matchedGroups':
-  - 'Theatrical.Movie.'
-  - '2007'
-  - '.'
-  - 'Theatrical'
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Theatrical.Movie.2007.UHD.BluRay.2160p.TrueHD.5.1.DV.HEVC.REMUX-FraMeSToR.mkv'
-  'lastRun': '2025-02-25T22:15:43.307902'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Thighs.yml b/regex_patterns/Thighs.yml
deleted file mode 100644
index 230ceec..0000000
--- a/regex_patterns/Thighs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Thighs
-pattern: \[Thighs\]|-Thighs\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Tigole.yml b/regex_patterns/Tigole.yml
deleted file mode 100644
index d45771e..0000000
--- a/regex_patterns/Tigole.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Tigole
-pattern: (?<=^|[\s.-])Tigole\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/TnF.yml b/regex_patterns/TnF.yml
deleted file mode 100644
index 660039d..0000000
--- a/regex_patterns/TnF.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'TnF'
-pattern: \b(TnF)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/TnP (1).yml b/regex_patterns/TnP (1).yml
deleted file mode 100644
index bc9dd01..0000000
--- a/regex_patterns/TnP (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TnP'
-'pattern': '(?<=^|[\s.-])TnP\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/TnP.yml b/regex_patterns/TnP.yml
index 62c2d05..7cf1978 100644
--- a/regex_patterns/TnP.yml
+++ b/regex_patterns/TnP.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])TnP\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/Trix.yml b/regex_patterns/Trix.yml
deleted file mode 100644
index d230b01..0000000
--- a/regex_patterns/Trix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Trix'
-pattern: \[Trix\]|-Trix\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Tron (1).yml b/regex_patterns/Tron (1).yml
deleted file mode 100644
index a666753..0000000
--- a/regex_patterns/Tron (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Tron'
-'pattern': '(?<=^|[\s.-])Tron\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/Tron.yml b/regex_patterns/Tron.yml
index 9640e6b..3415603 100644
--- a/regex_patterns/Tron.yml
+++ b/regex_patterns/Tron.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])Tron\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/TrueHD (1).yml b/regex_patterns/TrueHD (1).yml
deleted file mode 100644
index e134d41..0000000
--- a/regex_patterns/TrueHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'TrueHD'
-'pattern': 'True[ .-]?HD[ .-]?'
-'tags':
-- 'Audio'
-- 'Lossless'
-'tests': []
diff --git a/regex_patterns/TrueHD (Missing Groups) (1).yml b/regex_patterns/TrueHD (Missing Groups) (1).yml
deleted file mode 100644
index 53a158a..0000000
--- a/regex_patterns/TrueHD (Missing Groups) (1).yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-'description': 'Matches groups who mislabel TrueHD'
-'name': 'TrueHD (Missing Groups)'
-'pattern': '(?<=^|[\s.-])TRiToN|EPSiLON|NoGroup|PmP\b'
-'tags':
-- 'Audio'
-'tests': []
diff --git a/regex_patterns/TrueHD (Missing Groups).yml b/regex_patterns/TrueHD (Missing Groups).yml
index 1a8d72d..6aea80d 100644
--- a/regex_patterns/TrueHD (Missing Groups).yml	
+++ b/regex_patterns/TrueHD (Missing Groups).yml	
@@ -2,5 +2,5 @@ name: TrueHD (Missing Groups)
 pattern: (?<=^|[\s.-])TRiToN|EPSiLON|NoGroup|PmP\b
 description: Matches groups who mislabel TrueHD
 tags:
-- Release Group
+- Audio
 tests: []
diff --git a/regex_patterns/TrueHD.yml b/regex_patterns/TrueHD.yml
index 1c6bf5d..9b2a662 100644
--- a/regex_patterns/TrueHD.yml
+++ b/regex_patterns/TrueHD.yml
@@ -4,4 +4,4 @@ description: ''
 tags:
 - Audio
 - Lossless
-tests: []
\ No newline at end of file
+tests: []
diff --git a/regex_patterns/Tsundere (1).yml b/regex_patterns/Tsundere (1).yml
deleted file mode 100644
index 628d454..0000000
--- a/regex_patterns/Tsundere (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Tsundere'
-'pattern': '(?<=^|[\s.-])Tsundere\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Tsundere.yml b/regex_patterns/Tsundere.yml
index f99a387..6c15440 100644
--- a/regex_patterns/Tsundere.yml
+++ b/regex_patterns/Tsundere.yml
@@ -1,6 +1,7 @@
-name: 'Tsundere'
-pattern: \[Tsundere\]|-Tsundere(?!-)\b
+name: Tsundere
+pattern: (?<=^|[\s.-])Tsundere\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/U3-Web.yml b/regex_patterns/U3-Web.yml
deleted file mode 100644
index a51dbf6..0000000
--- a/regex_patterns/U3-Web.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'U3-Web'
-pattern: \b(U3-Web)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/UDF.yml b/regex_patterns/UDF.yml
deleted file mode 100644
index 597ff05..0000000
--- a/regex_patterns/UDF.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: UDF
-pattern: \b(UDF)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/UHD Blu-ray (1).yml b/regex_patterns/UHD Blu-ray (1).yml
deleted file mode 100644
index 5f72e71..0000000
--- a/regex_patterns/UHD Blu-ray (1).yml	
+++ /dev/null
@@ -1,16 +0,0 @@
-'description': 'Matches "UHD Bluray" or "UHD Blu-Ray" with a hyphen, space, dot or
-  underscore between them'
-'name': 'UHD Blu-ray'
-'pattern': '\bUHD[-_.\s]?Blu[-]?Ray\b'
-'tags': []
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Avatar: The Way of Water 2022 1080p UHD BluRay DDP 7.1 HDR10 x265-GALAXY'
-  'lastRun': '2025-01-13T06:32:22.686039'
-  'matchSpan':
-    'end': 46
-    'start': 36
-  'matchedContent': 'UHD BluRay'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/UHD Bluray (Missing Groups) (1).yml b/regex_patterns/UHD Bluray (Missing Groups) (1).yml
deleted file mode 100644
index 9db7eb1..0000000
--- a/regex_patterns/UHD Bluray (Missing Groups) (1).yml	
+++ /dev/null
@@ -1,16 +0,0 @@
-'description': 'Match release groups who don''t put UHD Bluray in their 1080p x265
-  HDR encodes'
-'name': 'UHD Bluray (Missing Groups)'
-'pattern': '(?<=^|[\s.-])LEGi0N\b'
-'tags': []
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Training Day 2001 1080p BluRay DDP 7 1 HDR x265-LEGi0N'
-  'lastRun': '2025-01-14T09:31:15.526804'
-  'matchSpan':
-    'end': 54
-    'start': 48
-  'matchedContent': 'LEGi0N'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/UHDCLUBREMUX (1).yml b/regex_patterns/UHDCLUBREMUX (1).yml
deleted file mode 100644
index a853317..0000000
--- a/regex_patterns/UHDCLUBREMUX (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'UHDCLUBREMUX'
-'pattern': '(?<=^|[\s.-])UHDCLUBREMUX\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/UHDCLUBREMUX.yml b/regex_patterns/UHDCLUBREMUX.yml
index 10bfa83..78f3424 100644
--- a/regex_patterns/UHDCLUBREMUX.yml
+++ b/regex_patterns/UHDCLUBREMUX.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])UHDCLUBREMUX\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/ULTRAHDCLUB (1).yml b/regex_patterns/ULTRAHDCLUB (1).yml
deleted file mode 100644
index 61e653b..0000000
--- a/regex_patterns/ULTRAHDCLUB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ULTRAHDCLUB'
-'pattern': '(?<=^|[\s.-])ULTRAHDCLUB\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ULTRAHDCLUB.yml b/regex_patterns/ULTRAHDCLUB.yml
index cdcc9d2..f67f04a 100644
--- a/regex_patterns/ULTRAHDCLUB.yml
+++ b/regex_patterns/ULTRAHDCLUB.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ULTRAHDCLUB\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/UNBIASED.yml b/regex_patterns/UNBIASED.yml
deleted file mode 100644
index 42a8738..0000000
--- a/regex_patterns/UNBIASED.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'UNBIASED'
-pattern: \[UNBIASED\]|-UNBIASED\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/UNK.yml b/regex_patterns/UNK.yml
deleted file mode 100644
index a4573c2..0000000
--- a/regex_patterns/UNK.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: UNK
-pattern: (?<=^|[\s.-])UNK\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/URANIME.yml b/regex_patterns/URANIME.yml
deleted file mode 100644
index 26d3d1a..0000000
--- a/regex_patterns/URANIME.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'URANIME'
-pattern: \b(URANIME)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/USD.yml b/regex_patterns/USD.yml
deleted file mode 100644
index e771e53..0000000
--- a/regex_patterns/USD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'USD'
-pattern: \[USD\]|-USD\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/UWU.yml b/regex_patterns/UWU.yml
deleted file mode 100644
index 2caa5a9..0000000
--- a/regex_patterns/UWU.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'UWU'
-pattern: \b(UWU)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Upscaled (1).yml b/regex_patterns/Upscaled (1).yml
deleted file mode 100644
index 0c91505..0000000
--- a/regex_patterns/Upscaled (1).yml	
+++ /dev/null
@@ -1,147 +0,0 @@
-'description': 'Matches upscales, regrades, AI Enhancements, etc. '
-'name': 'Upscaled'
-'pattern': '(Up[-\.\s]?scale|Re[-\.\s]?Grade|\bAIUS\b|AI[-\.\s]?enhanced)'
-'tags':
-- 'Enhancement'
-- 'UnWanted'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'The.Dukes.Of.Hazzard.Unrated.2005.2160p.Ai-Upscaled.10Bit.H265.DDP.5.1.RIFE.4.15-60fps-DirtyHippie'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 50
-    'start': 43
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': '[EG]Mobile Suit Gundam SEED 21 BD[HEVC DualAudio AI-Upscale]'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 59
-    'start': 52
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Death.Proof.2007.2160p.Ai-Upscaled.10Bit.H265.TrueHD.5.1-DirtyHippie RIFE.4.14v2-60fps.mkv'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 33
-    'start': 26
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': 'Oi.Aparadektoi.S02E03.[FullHDAIUpscaled][Upload-Ft4U]'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 38
-    'start': 31
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 5
-  'input': 'Cash.Out-I.maghi.del.furto.2024.UpScaled.2160p.H265.10.bit.DV.HDR10+.ita.eng.AC3.5.1.sub.ita.eng.Licdom'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 39
-    'start': 32
-  'matchedContent': 'UpScale'
-  'matchedGroups':
-  - 'UpScale'
-  'passes': true
-- 'expected': true
-  'id': 6
-  'input': '2012 (2009) UHD 4K Upscaled x264 AC3 Soup mkv'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 26
-    'start': 19
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 7
-  'input': 'The Martian 2015 4K UHD UPSCALED-ETRG'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 31
-    'start': 24
-  'matchedContent': 'UPSCALE'
-  'matchedGroups':
-  - 'UPSCALE'
-  'passes': true
-- 'expected': true
-  'id': 8
-  'input': 'WWE Smackdown 1999 S04 1080p (Upscaled) PEACOCK WEB-DL H 264 AAC 2 0'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 37
-    'start': 30
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 9
-  'input': 'Venom 023 (2023) (Digital) (Li''l-Empire) (HD-Upscaled)'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 52
-    'start': 45
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 10
-  'input': 'Natashas.Bondage.Sex.Vol.2.Upscaled'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 34
-    'start': 27
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 11
-  'input': 'Star Trek: Deep Space Nine S01 AI Upscale 2160p DVD AAC 2.0 H.263'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 41
-    'start': 34
-  'matchedContent': 'Upscale'
-  'matchedGroups':
-  - 'Upscale'
-  'passes': true
-- 'expected': true
-  'id': 12
-  'input': 'Avatar.2009.Extended.UHD.Re-Grade.4000nit.2160p.HEVC.HDR.IVACHS.ENG.ExKinoRay'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan':
-    'end': 33
-    'start': 25
-  'matchedContent': 'Re-Grade'
-  'matchedGroups':
-  - 'Re-Grade'
-  'passes': true
-- 'expected': false
-  'id': 13
-  'input': 'Enhanced.2020.1080p.Bluray.DTS-HD.MA.5.1.X264-EVO'
-  'lastRun': '2024-12-13T16:11:51.959589'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Upscaled.yml b/regex_patterns/Upscaled.yml
index 0c5a693..87af763 100644
--- a/regex_patterns/Upscaled.yml
+++ b/regex_patterns/Upscaled.yml
@@ -3,7 +3,7 @@ pattern: (Up[-\.\s]?scale|Re[-\.\s]?Grade|\bAIUS\b|AI[-\.\s]?enhanced)
 description: 'Matches upscales, regrades, AI Enhancements, etc. '
 tags:
 - Enhancement
-- Unwanted
+- UnWanted
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/VALiS (1).yml b/regex_patterns/VALiS (1).yml
deleted file mode 100644
index 8cfb4e3..0000000
--- a/regex_patterns/VALiS (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'VALiS'
-'pattern': '(?<=^|[\s.-])VALiS\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/VALiS.yml b/regex_patterns/VALiS.yml
index 43168d9..387b14f 100644
--- a/regex_patterns/VALiS.yml
+++ b/regex_patterns/VALiS.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])VALiS\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/VARYG (1).yml b/regex_patterns/VARYG (1).yml
deleted file mode 100644
index 26558eb..0000000
--- a/regex_patterns/VARYG (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'VARYG'
-'pattern': '(?<=^|[\s.-])VARYG\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/VARYG.yml b/regex_patterns/VARYG.yml
index e327b3c..0644195 100644
--- a/regex_patterns/VARYG.yml
+++ b/regex_patterns/VARYG.yml
@@ -1,6 +1,7 @@
-name: 'VARYG'
-pattern: \b(VARYG)\b
+name: VARYG
+pattern: (?<=^|[\s.-])VARYG\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/VD0N.yml b/regex_patterns/VD0N.yml
deleted file mode 100644
index 615be41..0000000
--- a/regex_patterns/VD0N.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'VD0N'
-pattern: '^(VD0N)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/VECTOR (1).yml b/regex_patterns/VECTOR (1).yml
deleted file mode 100644
index 027cc54..0000000
--- a/regex_patterns/VECTOR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer.'
-'name': 'VECTOR'
-'pattern': '(?<=^|[\s.-])VECTOR\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/VECTOR.yml b/regex_patterns/VECTOR.yml
index aaf8649..ea8df73 100644
--- a/regex_patterns/VECTOR.yml
+++ b/regex_patterns/VECTOR.yml
@@ -1,6 +1,7 @@
-name: 'VECTOR'
-pattern: '^(VECTOR)$'
-description: ''
+name: VECTOR
+pattern: (?<=^|[\s.-])VECTOR\b
+description: Banned for Fake DV/HDR Layer.
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/VISIONPLUSHDR.yml b/regex_patterns/VISIONPLUSHDR.yml
deleted file mode 100644
index 50a2a65..0000000
--- a/regex_patterns/VISIONPLUSHDR.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: VISIONPLUSHDR
-pattern: ^(VISIONPLUSHDR(-X|1000)?)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/VLAD (1).yml b/regex_patterns/VLAD (1).yml
deleted file mode 100644
index bcbb1aa..0000000
--- a/regex_patterns/VLAD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'VLAD'
-'pattern': '(?<=^|[\s.-])VLAD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/VLAD.yml b/regex_patterns/VLAD.yml
index 02eba48..fe4f7ab 100644
--- a/regex_patterns/VLAD.yml
+++ b/regex_patterns/VLAD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])VLAD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/VP9.yml b/regex_patterns/VP9.yml
index 7007141..99a420a 100644
--- a/regex_patterns/VP9.yml
+++ b/regex_patterns/VP9.yml
@@ -1,28 +1,28 @@
-'description': 'VP9 is an open and royalty-free video coding format developed by Google'
-'name': 'VP9'
-'pattern': '\b(VP9)\b'
-'tags':
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Kedi 2016 REPACK 2160p WEB-DL DD+ 5.1 VP9-WiLDCAT'
-  'lastRun': '2025-04-15T14:48:20.729485'
-  'matchSpan':
-    'end': 41
-    'start': 38
-  'matchedContent': 'VP9'
-  'matchedGroups':
-  - 'VP9'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Kedi.2016.Repack.2160p.WEB-DL.DDP.5.1.VP9-WiLDCAT.mkv'
-  'lastRun': '2025-04-15T14:48:20.729485'
-  'matchSpan':
-    'end': 41
-    'start': 38
-  'matchedContent': 'VP9'
-  'matchedGroups':
-  - 'VP9'
-  'passes': true
+name: VP9
+pattern: \b(VP9)\b
+description: VP9 is an open and royalty-free video coding format developed by Google
+tags:
+- Codec
+tests:
+- expected: true
+  id: 1
+  input: Kedi 2016 REPACK 2160p WEB-DL DD+ 5.1 VP9-WiLDCAT
+  lastRun: '2025-04-15T14:48:20.729485'
+  matchSpan:
+    end: 41
+    start: 38
+  matchedContent: VP9
+  matchedGroups:
+  - VP9
+  passes: true
+- expected: true
+  id: 2
+  input: Kedi.2016.Repack.2160p.WEB-DL.DDP.5.1.VP9-WiLDCAT.mkv
+  lastRun: '2025-04-15T14:48:20.729485'
+  matchSpan:
+    end: 41
+    start: 38
+  matchedContent: VP9
+  matchedGroups:
+  - VP9
+  passes: true
diff --git a/regex_patterns/VVC (1).yml b/regex_patterns/VVC (1).yml
deleted file mode 100644
index 1aab217..0000000
--- a/regex_patterns/VVC (1).yml	
+++ /dev/null
@@ -1,18 +0,0 @@
-'description': 'VVC, or Versatile Video Coding (H.266), is a video coding format that
-  compresses video files and streams to significantly smaller sizes than H.265 while
-  maintaining high quality.'
-'name': 'VVC'
-'pattern': '(?<=^|[\s.-])VVC\b'
-'tags':
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Aftersun.2022.1080p.BluRay.Opus.5.1.VVC-TayTO'
-  'lastRun': '2024-12-13T17:44:21.546788'
-  'matchSpan':
-    'end': 39
-    'start': 36
-  'matchedContent': 'VVC'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Valenciano.yml b/regex_patterns/Valenciano.yml
deleted file mode 100644
index 5fa71b1..0000000
--- a/regex_patterns/Valenciano.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Valenciano'
-pattern: \b(Valenciano)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Vanilla.yml b/regex_patterns/Vanilla.yml
deleted file mode 100644
index 61bf2bd..0000000
--- a/regex_patterns/Vanilla.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Vanilla
-pattern: \[Vanilla\]|-Vanilla\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Verus.yml b/regex_patterns/Verus.yml
deleted file mode 100644
index ee839e3..0000000
--- a/regex_patterns/Verus.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Verus
-pattern: (?<=^|[\s.-])Verus\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/ViSUM.yml b/regex_patterns/ViSUM.yml
deleted file mode 100644
index f3ef4ad..0000000
--- a/regex_patterns/ViSUM.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ViSUM'
-pattern: ^(ViSUM)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ViSiON.yml b/regex_patterns/ViSiON.yml
deleted file mode 100644
index 90924a8..0000000
--- a/regex_patterns/ViSiON.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ViSiON
-pattern: ^(ViSiON)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/VietHD (1).yml b/regex_patterns/VietHD (1).yml
deleted file mode 100644
index 0c6e72b..0000000
--- a/regex_patterns/VietHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'VietHD'
-'pattern': '(?<=^|[\s.-])VietHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/VietHD.yml b/regex_patterns/VietHD.yml
index c5411cf..753c44e 100644
--- a/regex_patterns/VietHD.yml
+++ b/regex_patterns/VietHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])VietHD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Viki (1).yml b/regex_patterns/Viki (1).yml
deleted file mode 100644
index f50c545..0000000
--- a/regex_patterns/Viki (1).yml	
+++ /dev/null
@@ -1,29 +0,0 @@
-'description': 'Rakuten Viki is an American over-the-top subscription video on-demand
-  streaming service. It streams videos similar to other services, but also allows
-  users to subtitle content available in 200 languages as well as providing original
-  programming.'
-'name': 'Viki'
-'pattern': '\b(Viki)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Make Up with Mud 2024 S01E01 1080p VIKI WEB-DL AAC 2.0 H.264-DUSKLiGHT'
-  'lastRun': '2025-06-01T17:53:57.847362'
-  'matchSpan':
-    'end': 39
-    'start': 21
-  'matchedContent': ' S01E01 1080p VIKI'
-  'matchedGroups':
-  - 'VIKI'
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Vikings S06 Part 1 1080p Blu-ray AVC DTS-HD MA 5.1-SLIPSTREAM'
-  'lastRun': '2025-06-01T17:53:57.847362'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/Viki.yml b/regex_patterns/Viki.yml
index 598fb5e..774d5d9 100644
--- a/regex_patterns/Viki.yml
+++ b/regex_patterns/Viki.yml
@@ -1,7 +1,29 @@
 name: Viki
 pattern: \b(Viki)\b
-description: Rakuten Viki is an American over-the-top subscription video on-demand streaming service. It streams videos similar to other services, but also allows users to subtitle content available in 200 languages as well as providing original programming.
+description: Rakuten Viki is an American over-the-top subscription video on-demand
+  streaming service. It streams videos similar to other services, but also allows
+  users to subtitle content available in 200 languages as well as providing original
+  programming.
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests:
+- expected: true
+  id: 1
+  input: Make Up with Mud 2024 S01E01 1080p VIKI WEB-DL AAC 2.0 H.264-DUSKLiGHT
+  lastRun: '2025-06-01T17:53:57.847362'
+  matchSpan:
+    end: 39
+    start: 21
+  matchedContent: ' S01E01 1080p VIKI'
+  matchedGroups:
+  - VIKI
+  passes: true
+- expected: false
+  id: 2
+  input: Vikings S06 Part 1 1080p Blu-ray AVC DTS-HD MA 5.1-SLIPSTREAM
+  lastRun: '2025-06-01T17:53:57.847362'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
diff --git a/regex_patterns/VipapkStudios.yml b/regex_patterns/VipapkStudios.yml
deleted file mode 100644
index 63cb901..0000000
--- a/regex_patterns/VipapkStudios.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'VipapkStudios'
-pattern: \b(VipapkStudios)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/VisionXpert.yml b/regex_patterns/VisionXpert.yml
index 2564b41..73f4793 100644
--- a/regex_patterns/VisionXpert.yml
+++ b/regex_patterns/VisionXpert.yml
@@ -1,7 +1,7 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'VisionXpert'
-'pattern': '(?<=^|[\s.-])VisionXpert\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: VisionXpert
+pattern: (?<=^|[\s.-])VisionXpert\b
+description: Banned for Fake DV/HDR Layer
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/Viu (1).yml b/regex_patterns/Viu (1).yml
deleted file mode 100644
index 837177a..0000000
--- a/regex_patterns/Viu (1).yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-'description': 'Viu is a Hong Kong-based over-the-top video on demand streaming service
-  from PCCW Media Group''s Viu International Ltd. Viu delivers content in different
-  genres from Asia''s top content providers with local language subtitles'
-'name': 'Viu'
-'pattern': '\b(Viu)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/Viu.yml b/regex_patterns/Viu.yml
index 24de049..55bc8fc 100644
--- a/regex_patterns/Viu.yml
+++ b/regex_patterns/Viu.yml
@@ -1,7 +1,9 @@
 name: Viu
 pattern: \b(Viu)\b
-description: Viu is a Hong Kong-based over-the-top video on demand streaming service from PCCW Media Group's Viu International Ltd. Viu delivers content in different genres from Asia's top content providers with local language subtitles
+description: Viu is a Hong Kong-based over-the-top video on demand streaming service
+  from PCCW Media Group's Viu International Ltd. Viu delivers content in different
+  genres from Asia's top content providers with local language subtitles
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests: []
diff --git a/regex_patterns/Vivid.yml b/regex_patterns/Vivid.yml
deleted file mode 100644
index 407df4f..0000000
--- a/regex_patterns/Vivid.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Vivid'
-pattern: \[Vivid\]|-Vivid\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Vodes (1).yml b/regex_patterns/Vodes (1).yml
deleted file mode 100644
index 10f0690..0000000
--- a/regex_patterns/Vodes (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Vodes'
-'pattern': '(?<=^|[\s.-])Vodes\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Vodes.yml b/regex_patterns/Vodes.yml
index c817aa7..68d6779 100644
--- a/regex_patterns/Vodes.yml
+++ b/regex_patterns/Vodes.yml
@@ -1,6 +1,7 @@
 name: Vodes
-pattern: \[Vodes\]|(?<!Not)-Vodes\b
+pattern: (?<=^|[\s.-])Vodes\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Vyndros.yml b/regex_patterns/Vyndros.yml
index e29f5a3..ce2e610 100644
--- a/regex_patterns/Vyndros.yml
+++ b/regex_patterns/Vyndros.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'Vyndros'
-'pattern': '(?<=^|[\s.-])Vyndros\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: Vyndros
+pattern: (?<=^|[\s.-])Vyndros\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/W4NK3R (1).yml b/regex_patterns/W4NK3R (1).yml
deleted file mode 100644
index 36f678d..0000000
--- a/regex_patterns/W4NK3R (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'W4NK3R'
-'pattern': '(?<=^|[\s.-])W4NK3R\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/W4NK3R.yml b/regex_patterns/W4NK3R.yml
index 2190524..97094ed 100644
--- a/regex_patterns/W4NK3R.yml
+++ b/regex_patterns/W4NK3R.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])W4NK3R\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/WAF.yml b/regex_patterns/WAF.yml
deleted file mode 100644
index 6618d04..0000000
--- a/regex_patterns/WAF.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: WAF
-pattern: ^(WAF)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/WATCHABLE (1).yml b/regex_patterns/WATCHABLE (1).yml
deleted file mode 100644
index 2c75028..0000000
--- a/regex_patterns/WATCHABLE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'WATCHABLE'
-'pattern': '(?<=^|[\s.-])WATCHABLE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/WATCHABLE.yml b/regex_patterns/WATCHABLE.yml
index f35cd2a..5ca2e23 100644
--- a/regex_patterns/WATCHABLE.yml
+++ b/regex_patterns/WATCHABLE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])WATCHABLE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/WBDP (1).yml b/regex_patterns/WBDP (1).yml
deleted file mode 100644
index 8450c61..0000000
--- a/regex_patterns/WBDP (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'WBDP'
-'pattern': '(?<=^|[\s.-])WBDP\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/WBDP.yml b/regex_patterns/WBDP.yml
index 8bf6314..57e85c9 100644
--- a/regex_patterns/WBDP.yml
+++ b/regex_patterns/WBDP.yml
@@ -1,6 +1,7 @@
-name: 'WBDP'
-pattern: \b(WBDP)\b
+name: WBDP
+pattern: (?<=^|[\s.-])WBDP\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/WEBDV.yml b/regex_patterns/WEBDV.yml
deleted file mode 100644
index d512e9b..0000000
--- a/regex_patterns/WEBDV.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'WEBDV'
-pattern: '^(WEBDV)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/WELP.yml b/regex_patterns/WELP.yml
deleted file mode 100644
index d9209a3..0000000
--- a/regex_patterns/WELP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: WELP
-pattern: ^(WELP)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/WMING (1).yml b/regex_patterns/WMING (1).yml
deleted file mode 100644
index caa8dd7..0000000
--- a/regex_patterns/WMING (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'WMING'
-'pattern': '(?<=^|[\s.-])WMING\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/WMING.yml b/regex_patterns/WMING.yml
index 1d1d45e..655e065 100644
--- a/regex_patterns/WMING.yml
+++ b/regex_patterns/WMING.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])WMING\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/WOU (1).yml b/regex_patterns/WOU (1).yml
deleted file mode 100644
index 8f8706b..0000000
--- a/regex_patterns/WOU (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'WOU'
-'pattern': '(?<=^|[\s.-])WOU\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/WOU.yml b/regex_patterns/WOU.yml
index 132c891..e1586e6 100644
--- a/regex_patterns/WOU.yml
+++ b/regex_patterns/WOU.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])WOU\b
 description: ''
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/WSE.yml b/regex_patterns/WSE.yml
deleted file mode 100644
index 5d8ab2e..0000000
--- a/regex_patterns/WSE.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'WSE'
-pattern: \b(WSE)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/WaLMaRT.yml b/regex_patterns/WaLMaRT.yml
deleted file mode 100644
index 89bed07..0000000
--- a/regex_patterns/WaLMaRT.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'WaLMaRT'
-pattern: \b(WaLMaRT)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Wardevil.yml b/regex_patterns/Wardevil.yml
deleted file mode 100644
index 0b93b55..0000000
--- a/regex_patterns/Wardevil.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Wardevil'
-pattern: \[Wardevil\]|-Wardevil\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Watashi.yml b/regex_patterns/Watashi.yml
deleted file mode 100644
index d3b609f..0000000
--- a/regex_patterns/Watashi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Watashi'
-pattern: \[Watashi\]|-Watashi\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Wavve (1).yml b/regex_patterns/Wavve (1).yml
deleted file mode 100644
index e3173c0..0000000
--- a/regex_patterns/Wavve (1).yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-'description': 'Wavve is an online streaming platform, that was first launched on
-  September 18, 2019. The company was founded as a joint venture between SK Telecom
-  and South Korea''s three terrestrial broadcasters KBS, MBC, SBS.'
-'name': 'Wavve'
-'pattern': '\b(Wavve)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/Wavve.yml b/regex_patterns/Wavve.yml
index 6518f76..9e7d69f 100644
--- a/regex_patterns/Wavve.yml
+++ b/regex_patterns/Wavve.yml
@@ -1,7 +1,9 @@
 name: Wavve
 pattern: \b(Wavve)\b
-description: Wavve is an online streaming platform, that was first launched on September 18, 2019. The company was founded as a joint venture between SK Telecom and South Korea's three terrestrial broadcasters KBS, MBC, SBS.
+description: Wavve is an online streaming platform, that was first launched on September
+  18, 2019. The company was founded as a joint venture between SK Telecom and South
+  Korea's three terrestrial broadcasters KBS, MBC, SBS.
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests: []
diff --git a/regex_patterns/WeTV (1).yml b/regex_patterns/WeTV (1).yml
deleted file mode 100644
index 5f5eec1..0000000
--- a/regex_patterns/WeTV (1).yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-'description': 'Tencent Video also called WeTV outside of China, is a Chinese video
-  streaming website owned by Tencent. The website was launched in April 2011, and
-  is one of China''s largest online video platforms'
-'name': 'WeTV'
-'pattern': '\b(WeTV)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/WeTV.yml b/regex_patterns/WeTV.yml
index 1d38033..309e753 100644
--- a/regex_patterns/WeTV.yml
+++ b/regex_patterns/WeTV.yml
@@ -1,7 +1,9 @@
 name: WeTV
 pattern: \b(WeTV)\b
-description: Tencent Video also called WeTV outside of China, is a Chinese video streaming website owned by Tencent. The website was launched in April 2011, and is one of China's largest online video platforms
+description: Tencent Video also called WeTV outside of China, is a Chinese video streaming
+  website owned by Tencent. The website was launched in April 2011, and is one of
+  China's largest online video platforms
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests: []
diff --git a/regex_patterns/WhiteRhino (1).yml b/regex_patterns/WhiteRhino (1).yml
deleted file mode 100644
index ff920c3..0000000
--- a/regex_patterns/WhiteRhino (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'WhiteRhino'
-'pattern': '(?<=^|[\s.-])WhiteRhino\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/WhiteRhino.yml b/regex_patterns/WhiteRhino.yml
index d2fbb05..eea406e 100644
--- a/regex_patterns/WhiteRhino.yml
+++ b/regex_patterns/WhiteRhino.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])WhiteRhino\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/WiKi (1).yml b/regex_patterns/WiKi (1).yml
deleted file mode 100644
index 147d789..0000000
--- a/regex_patterns/WiKi (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'WiKi'
-'pattern': '(?<=^|[\s.-])WiKi\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/WiKi.yml b/regex_patterns/WiKi.yml
index 9c37efb..bb8b74d 100644
--- a/regex_patterns/WiKi.yml
+++ b/regex_patterns/WiKi.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])WiKi\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/WiLDCAT.yml b/regex_patterns/WiLDCAT.yml
index 38f415a..9f37300 100644
--- a/regex_patterns/WiLDCAT.yml
+++ b/regex_patterns/WiLDCAT.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'WiLDCAT'
-'pattern': '(?<=^|[\s.-])WiLDCAT\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
+name: WiLDCAT
+pattern: (?<=^|[\s.-])WiLDCAT\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/Will1869.yml b/regex_patterns/Will1869.yml
deleted file mode 100644
index bb871b2..0000000
--- a/regex_patterns/Will1869.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Will1869'
-pattern: '\\b(Will1869)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/WtF_Anime.yml b/regex_patterns/WtF_Anime.yml
deleted file mode 100644
index c37c632..0000000
--- a/regex_patterns/WtF_Anime.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'WtF Anime'
-pattern: \b(WtF[ ._-]?Anime)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/XEBEC (1).yml b/regex_patterns/XEBEC (1).yml
deleted file mode 100644
index 47e03a4..0000000
--- a/regex_patterns/XEBEC (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'XEBEC'
-'pattern': '(?<=^|[\s.-])XEBEC\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/XEBEC.yml b/regex_patterns/XEBEC.yml
index 6b7028f..846832a 100644
--- a/regex_patterns/XEBEC.yml
+++ b/regex_patterns/XEBEC.yml
@@ -1,6 +1,7 @@
 name: XEBEC
-pattern: ^(XEBEC|4KBEC|CEBEX)$
+pattern: (?<=^|[\s.-])XEBEC\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/Xvid (1).yml b/regex_patterns/Xvid (1).yml
deleted file mode 100644
index 9fe7fed..0000000
--- a/regex_patterns/Xvid (1).yml	
+++ /dev/null
@@ -1,29 +0,0 @@
-'description': 'Xvid is a video codec based on the MPEG-4 Part 2 standard, designed
-  for efficient compression while maintaining good visual quality. It is commonly
-  used for encoding videos into smaller file sizes suitable for online sharing or
-  storage, often paired with MP3 or AAC audio. '
-'name': 'Xvid'
-'pattern': '(?i)[-. ]Xvid'
-'tags':
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'U2.Vertigo.Live.From.Chicago.720p.AC3.5.1ch.Xvid'
-  'lastRun': '2024-12-08T22:47:07.712482'
-  'matchSpan':
-    'end': 48
-    'start': 43
-  'matchedContent': '.Xvid'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Britney Spears-Toxic-Hdtv-720P-Xvid.avi'
-  'lastRun': '2024-12-08T22:47:07.712482'
-  'matchSpan':
-    'end': 35
-    'start': 30
-  'matchedContent': '-Xvid'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/YAWNiX.yml b/regex_patterns/YAWNiX.yml
index 305a134..c7fc78c 100644
--- a/regex_patterns/YAWNiX.yml
+++ b/regex_patterns/YAWNiX.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'YAWNiX'
-'pattern': '(?<=^|[\s.-])YAWNiX\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: YAWNiX
+pattern: (?<=^|[\s.-])YAWNiX\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/YELLO.yml b/regex_patterns/YELLO.yml
index 6923983..39ddc7f 100644
--- a/regex_patterns/YELLO.yml
+++ b/regex_patterns/YELLO.yml
@@ -1,7 +1,7 @@
-'description': ''
-'name': 'YELLO'
-'pattern': '(?<=^|[\s.-])YELLO\b'
-'tags':
-- 'Release Group'
-- 'HEVC'
-'tests': []
+name: YELLO
+pattern: (?<=^|[\s.-])YELLO\b
+description: ''
+tags:
+- Release Group
+- HEVC
+tests: []
diff --git a/regex_patterns/YIFY.yml b/regex_patterns/YIFY.yml
deleted file mode 100644
index 2aa96c3..0000000
--- a/regex_patterns/YIFY.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: YIFY
-pattern: ^(YIFY)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/YTS.yml b/regex_patterns/YTS.yml
deleted file mode 100644
index b09c169..0000000
--- a/regex_patterns/YTS.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: YTS
-pattern: ^(YTS(.(MX|LT|AG))?)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/YURI (1).yml b/regex_patterns/YURI (1).yml
deleted file mode 100644
index 2e40a51..0000000
--- a/regex_patterns/YURI (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'YURI'
-'pattern': '(?<=^|[\s.-])YURI\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/YURI.yml b/regex_patterns/YURI.yml
index 5eb748f..9e013a7 100644
--- a/regex_patterns/YURI.yml
+++ b/regex_patterns/YURI.yml
@@ -1,6 +1,7 @@
-name: 'YURI'
-pattern: \[YURI\]|-YURI\b
+name: YURI
+pattern: (?<=^|[\s.-])YURI\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Yabai.yml b/regex_patterns/Yabai.yml
deleted file mode 100644
index b9dee92..0000000
--- a/regex_patterns/Yabai.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Yabai'
-pattern: \[Yabai\]|-Yabai\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Yabai_Desu_NeRandomRemux.yml b/regex_patterns/Yabai_Desu_NeRandomRemux.yml
deleted file mode 100644
index f749cc3..0000000
--- a/regex_patterns/Yabai_Desu_NeRandomRemux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Yabai_Desu_NeRandomRemux'
-pattern: \b(Yabai_Desu_NeRandomRemux)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/YakuboEncodes.yml b/regex_patterns/YakuboEncodes.yml
deleted file mode 100644
index 90aef07..0000000
--- a/regex_patterns/YakuboEncodes.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'YakuboEncodes'
-pattern: \b(YakuboEncodes)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Yameii.yml b/regex_patterns/Yameii.yml
deleted file mode 100644
index 51734d7..0000000
--- a/regex_patterns/Yameii.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Yameii
-pattern: \[Yameii\]|-Yameii\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/Yoghurt.yml b/regex_patterns/Yoghurt.yml
deleted file mode 100644
index 16e911b..0000000
--- a/regex_patterns/Yoghurt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Yoghurt'
-pattern: \b(Yoghurt)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/YuiSubs.yml b/regex_patterns/YuiSubs.yml
deleted file mode 100644
index 7b7d8d2..0000000
--- a/regex_patterns/YuiSubs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'YuiSubs'
-pattern: \b(YuiSubs)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Yuki (1).yml b/regex_patterns/Yuki (1).yml
deleted file mode 100644
index bb2622f..0000000
--- a/regex_patterns/Yuki (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Yuki'
-'pattern': '(?<=^|[\s.-])Yuki\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Yuki.yml b/regex_patterns/Yuki.yml
index 6d659aa..9a83bac 100644
--- a/regex_patterns/Yuki.yml
+++ b/regex_patterns/Yuki.yml
@@ -1,6 +1,7 @@
 name: Yuki
-pattern: \[Yuki\]|-Yuki\b
+pattern: (?<=^|[\s.-])Yuki\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/Yun.yml b/regex_patterns/Yun.yml
deleted file mode 100644
index a3066b0..0000000
--- a/regex_patterns/Yun.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Yun'
-pattern: \[Yun\]|-Yun\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Z4ST1N.yml b/regex_patterns/Z4ST1N.yml
deleted file mode 100644
index 89b28d7..0000000
--- a/regex_patterns/Z4ST1N.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Z4ST1N
-pattern: \b(Z4ST1N)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ZIMBO (1).yml b/regex_patterns/ZIMBO (1).yml
deleted file mode 100644
index 04c185b..0000000
--- a/regex_patterns/ZIMBO (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ZIMBO'
-'pattern': '(?<=^|[\s.-])ZIMBO\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ZIMBO.yml b/regex_patterns/ZIMBO.yml
index 6827e59..28b4ab3 100644
--- a/regex_patterns/ZIMBO.yml
+++ b/regex_patterns/ZIMBO.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ZIMBO\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/ZOIO.yml b/regex_patterns/ZOIO.yml
deleted file mode 100644
index b61249c..0000000
--- a/regex_patterns/ZOIO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ZOIO'
-pattern: \b(ZOIO)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ZQ (1).yml b/regex_patterns/ZQ (1).yml
deleted file mode 100644
index 27add77..0000000
--- a/regex_patterns/ZQ (1).yml	
+++ /dev/null
@@ -1,8 +0,0 @@
-'description': ''
-'name': 'ZQ'
-'pattern': '(?<=^|[\s.-])ZQ\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ZQ.yml b/regex_patterns/ZQ.yml
index 73dac15..715051b 100644
--- a/regex_patterns/ZQ.yml
+++ b/regex_patterns/ZQ.yml
@@ -3,4 +3,6 @@ pattern: (?<=^|[\s.-])ZQ\b
 description: ''
 tags:
 - Release Group
+- Remux
+- Bluray
 tests: []
diff --git a/regex_patterns/ZR (1).yml b/regex_patterns/ZR (1).yml
deleted file mode 100644
index 0faec3f..0000000
--- a/regex_patterns/ZR (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ZR'
-'pattern': '(?<=^|[\s.-])ZR\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/ZR.yml b/regex_patterns/ZR.yml
index 3c416f6..4f9f087 100644
--- a/regex_patterns/ZR.yml
+++ b/regex_patterns/ZR.yml
@@ -1,6 +1,7 @@
-name: 'ZR'
-pattern: \b(ZR)\b
+name: ZR
+pattern: (?<=^|[\s.-])ZR\b
 description: ''
 tags:
 - Release Group
-tests: []
\ No newline at end of file
+- Anime
+tests: []
diff --git a/regex_patterns/ZeroBuild.yml b/regex_patterns/ZeroBuild.yml
deleted file mode 100644
index 809887f..0000000
--- a/regex_patterns/ZeroBuild.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ZeroBuild
-pattern: \b(ZeroBuild)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/Zeus.yml b/regex_patterns/Zeus.yml
deleted file mode 100644
index 7066d34..0000000
--- a/regex_patterns/Zeus.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Zeus
-pattern: ^(Zeus)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/ZigZag.yml b/regex_patterns/ZigZag.yml
deleted file mode 100644
index 8b4547a..0000000
--- a/regex_patterns/ZigZag.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'ZigZag'
-pattern: \[ZigZag\]|-ZigZab\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/ZoroSenpai (1).yml b/regex_patterns/ZoroSenpai (1).yml
deleted file mode 100644
index 0062b82..0000000
--- a/regex_patterns/ZoroSenpai (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'ZoroSenpai'
-'pattern': '(?<=^|[\s.-])ZoroSenpai\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/ZoroSenpai.yml b/regex_patterns/ZoroSenpai.yml
index 1b6ed8d..f32fb26 100644
--- a/regex_patterns/ZoroSenpai.yml
+++ b/regex_patterns/ZoroSenpai.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])ZoroSenpai\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/Zurako (1).yml b/regex_patterns/Zurako (1).yml
deleted file mode 100644
index 9c341bc..0000000
--- a/regex_patterns/Zurako (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'Zurako'
-'pattern': '(?<=^|[\s.-])Zurako\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/Zurako.yml b/regex_patterns/Zurako.yml
index 0f7be3a..bd3e19b 100644
--- a/regex_patterns/Zurako.yml
+++ b/regex_patterns/Zurako.yml
@@ -1,6 +1,7 @@
-name: 'Zurako'
-pattern: \b(Zurako)\b
+name: Zurako
+pattern: (?<=^|[\s.-])Zurako\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/aXXo.yml b/regex_patterns/aXXo.yml
deleted file mode 100644
index 6a90724..0000000
--- a/regex_patterns/aXXo.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'aXXo'
-pattern: '^(aXXo)$'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/aro.yml b/regex_patterns/aro.yml
deleted file mode 100644
index 3f9d9bb..0000000
--- a/regex_patterns/aro.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: aro
-pattern: \b(aro)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/b0mbardiers (1).yml b/regex_patterns/b0mbardiers (1).yml
deleted file mode 100644
index 929a739..0000000
--- a/regex_patterns/b0mbardiers (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'b0mbardiers'
-'pattern': '(?<=^|[\s.-])b0mbardiers\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/b0mbardiers.yml b/regex_patterns/b0mbardiers.yml
index 96299fd..bbdffae 100644
--- a/regex_patterns/b0mbardiers.yml
+++ b/regex_patterns/b0mbardiers.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])b0mbardiers\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/beAst (1).yml b/regex_patterns/beAst (1).yml
deleted file mode 100644
index bf7f772..0000000
--- a/regex_patterns/beAst (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'beAst'
-'pattern': '(?<=^|[\s.-])beAst\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/beAst.yml b/regex_patterns/beAst.yml
index afbfad3..a3e0502 100644
--- a/regex_patterns/beAst.yml
+++ b/regex_patterns/beAst.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])beAst\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/bonkai77.yml b/regex_patterns/bonkai77.yml
deleted file mode 100644
index 8dbb048..0000000
--- a/regex_patterns/bonkai77.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'bonkai77'
-pattern: \b(bonkai77)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/c0kE (1).yml b/regex_patterns/c0kE (1).yml
deleted file mode 100644
index e3174a0..0000000
--- a/regex_patterns/c0kE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'c0kE'
-'pattern': '(?<=^|[\s.-])c0kE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/c0kE.yml b/regex_patterns/c0kE.yml
index c5e1e81..37bc4e8 100644
--- a/regex_patterns/c0kE.yml
+++ b/regex_patterns/c0kE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])c0kE\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/d3g (1).yml b/regex_patterns/d3g (1).yml
deleted file mode 100644
index 99af391..0000000
--- a/regex_patterns/d3g (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for LQ and various Encode Issues.'
-'name': 'd3g'
-'pattern': '(?<=^|[\s.-])d3g\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/d3g-d3g.yml b/regex_patterns/d3g-d3g.yml
deleted file mode 100644
index 247b364..0000000
--- a/regex_patterns/d3g-d3g.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: d3g-d3g
-pattern: (?<=^|[\s.-])d3g-d3g\b
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/d3g.yml b/regex_patterns/d3g.yml
index 6b4dccb..e7f4739 100644
--- a/regex_patterns/d3g.yml
+++ b/regex_patterns/d3g.yml
@@ -1,6 +1,7 @@
 name: d3g
 pattern: (?<=^|[\s.-])d3g\b
-description: ''
+description: Banned for LQ and various Encode Issues.
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/dB (1).yml b/regex_patterns/dB (1).yml
deleted file mode 100644
index dab4069..0000000
--- a/regex_patterns/dB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'dB'
-'pattern': '(?<=^|[\s.-])dB\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/dB.yml b/regex_patterns/dB.yml
index 3550bc4..f8ae992 100644
--- a/regex_patterns/dB.yml
+++ b/regex_patterns/dB.yml
@@ -1,6 +1,7 @@
 name: dB
-pattern: ^(dB)$
+pattern: (?<=^|[\s.-])dB\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/de(42).yml b/regex_patterns/de(42).yml
index d8280e5..1263c5e 100644
--- a/regex_patterns/de(42).yml
+++ b/regex_patterns/de(42).yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])de[42]\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/de[42].yml b/regex_patterns/de[42].yml
deleted file mode 100644
index f83b7bc..0000000
--- a/regex_patterns/de[42].yml
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'de[42]'
-'pattern': '(?<=^|[\s.-])de[42]\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/deanzel (1).yml b/regex_patterns/deanzel (1).yml
deleted file mode 100644
index 2353f72..0000000
--- a/regex_patterns/deanzel (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'deanzel'
-'pattern': '(?<=^|[\s.-])deanzel\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/deanzel.yml b/regex_patterns/deanzel.yml
index b8f2bd2..5c0818d 100644
--- a/regex_patterns/deanzel.yml
+++ b/regex_patterns/deanzel.yml
@@ -1,6 +1,7 @@
-name: 'deanzel'
-pattern: \b(deanzel)\b
+name: deanzel
+pattern: (?<=^|[\s.-])deanzel\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/decibeL (1).yml b/regex_patterns/decibeL (1).yml
deleted file mode 100644
index c073fb6..0000000
--- a/regex_patterns/decibeL (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'decibeL'
-'pattern': '(?<=^|[\s.-])decibeL\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/decibeL.yml b/regex_patterns/decibeL.yml
index ce9a109..9ba4436 100644
--- a/regex_patterns/decibeL.yml
+++ b/regex_patterns/decibeL.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])decibeL\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/dkore (1).yml b/regex_patterns/dkore (1).yml
deleted file mode 100644
index 81234af..0000000
--- a/regex_patterns/dkore (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'dkore'
-'pattern': '(?<=^|[\s.-])dkore\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/dkore.yml b/regex_patterns/dkore.yml
index b3c2d9e..de893b8 100644
--- a/regex_patterns/dkore.yml
+++ b/regex_patterns/dkore.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])dkore\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Anime
+tests: []
diff --git a/regex_patterns/edge2020 (1).yml b/regex_patterns/edge2020 (1).yml
deleted file mode 100644
index 870db23..0000000
--- a/regex_patterns/edge2020 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for LQ, Mislabeling, and Upscale'
-'name': 'edge2020'
-'pattern': '(?<=^|[\s.-])edge2020\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/edge2020.yml b/regex_patterns/edge2020.yml
index cf76b26..f9cbda7 100644
--- a/regex_patterns/edge2020.yml
+++ b/regex_patterns/edge2020.yml
@@ -1,6 +1,7 @@
 name: edge2020
 pattern: (?<=^|[\s.-])edge2020\b
-description: ''
+description: Banned for LQ, Mislabeling, and Upscale
 tags:
 - Release Group
-tests: null
+- UnWanted
+tests: []
diff --git a/regex_patterns/h265 (1).yml b/regex_patterns/h265 (1).yml
deleted file mode 100644
index 5c49117..0000000
--- a/regex_patterns/h265 (1).yml	
+++ /dev/null
@@ -1,45 +0,0 @@
-'description': 'A video compression standard that delivers higher efficiency than
-  H.264, enabling better quality at lower bitrates, ideal for 4K and HDR content.'
-'name': 'h265'
-'pattern': '(?i)h\s*\.?\s*265'
-'tags':
-- 'Codec'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0 English
-    - r00t QxR)'
-  'lastRun': '2024-12-17T18:05:24.558038'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': false
-  'id': 2
-  'input': 'Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio'
-  'lastRun': '2024-12-17T18:05:24.558038'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'The Batman (2022) (1080p HMAX WEB-DL H265 SDR DDP Atmos 5.1 English -
-    HONE)'
-  'lastRun': '2024-12-17T18:05:24.558038'
-  'matchSpan':
-    'end': 41
-    'start': 37
-  'matchedContent': 'H265'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': "\t The Batman (2022) 1080p AMZN WEB-DL H265 SDR DDP 5.1 English-DarQ"
-  'lastRun': '2024-12-17T18:05:24.558038'
-  'matchSpan':
-    'end': 42
-    'start': 38
-  'matchedContent': 'H265'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/h265 WEB Groups.yml b/regex_patterns/h265 WEB Groups.yml
deleted file mode 100644
index c24e958..0000000
--- a/regex_patterns/h265 WEB Groups.yml	
+++ /dev/null
@@ -1,16 +0,0 @@
-name: h265 WEB Groups
-pattern: (?<=^|[\s.-])SiGLA\b
-description: Attempts to match groups who label their h265 WEB-DLs as HEVC.
-tags:
-- Release Group
-tests:
-- expected: true
-  id: 1
-  input: Full.Metal.Jacket.1987.1080p.HMAX.WEB-DL.DD5.1.HEVC-SiGLA.mkv
-  lastRun: '2024-12-12T06:05:25.670476'
-  matchSpan:
-    end: 57
-    start: 52
-  matchedContent: SiGLA
-  matchedGroups: []
-  passes: true
diff --git a/regex_patterns/hallowed (1).yml b/regex_patterns/hallowed (1).yml
deleted file mode 100644
index 7f1cf26..0000000
--- a/regex_patterns/hallowed (1).yml	
+++ /dev/null
@@ -1,17 +0,0 @@
-'description': ''
-'name': 'hallowed'
-'pattern': '(?<=^|[\s.-])hallowed\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Contact.1997.BluRay.1080p.DDP.5.1.x264-hallowed'
-  'lastRun': '2025-01-13T02:50:54.178942'
-  'matchSpan':
-    'end': 47
-    'start': 39
-  'matchedContent': 'hallowed'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/hallowed.yml b/regex_patterns/hallowed.yml
index 8d20070..8e7d6fa 100644
--- a/regex_patterns/hallowed.yml
+++ b/regex_patterns/hallowed.yml
@@ -3,6 +3,7 @@ pattern: (?<=^|[\s.-])hallowed\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests:
 - expected: true
   id: 1
diff --git a/regex_patterns/hchcsen (1).yml b/regex_patterns/hchcsen (1).yml
deleted file mode 100644
index 5623744..0000000
--- a/regex_patterns/hchcsen (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'hchcsen'
-'pattern': '(?<=^|[\s.-])hchcsen\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/hchcsen.yml b/regex_patterns/hchcsen.yml
index fe407ca..4a8846b 100644
--- a/regex_patterns/hchcsen.yml
+++ b/regex_patterns/hchcsen.yml
@@ -1,6 +1,7 @@
-name: 'hchcsen'
-pattern: \b(hchcsen)\b
+name: hchcsen
+pattern: (?<=^|[\s.-])hchcsen\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/hdalx (1).yml b/regex_patterns/hdalx (1).yml
deleted file mode 100644
index 946cf3e..0000000
--- a/regex_patterns/hdalx (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'hdalx'
-'pattern': '(?<=^|[\s.-])hdalx\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/hdalx.yml b/regex_patterns/hdalx.yml
index 236d6fd..deed4b3 100644
--- a/regex_patterns/hdalx.yml
+++ b/regex_patterns/hdalx.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])hdalx\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/hi10p.yml b/regex_patterns/hi10p.yml
deleted file mode 100644
index 8170553..0000000
--- a/regex_patterns/hi10p.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'hi10p'
-pattern: 'hi10p'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/hydes.yml b/regex_patterns/hydes.yml
deleted file mode 100644
index ab95bd9..0000000
--- a/regex_patterns/hydes.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: hydes
-pattern: \b(hydes)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iAHD.yml b/regex_patterns/iAHD.yml
deleted file mode 100644
index 133fc32..0000000
--- a/regex_patterns/iAHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'iAHD'
-pattern: \b(iAHD)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iCandy (1).yml b/regex_patterns/iCandy (1).yml
deleted file mode 100644
index 78df4a3..0000000
--- a/regex_patterns/iCandy (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'iCandy'
-'pattern': '(?<=^|[\s.-])iCandy\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/iCandy.yml b/regex_patterns/iCandy.yml
index 77e91ab..39828ad 100644
--- a/regex_patterns/iCandy.yml
+++ b/regex_patterns/iCandy.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])iCandy\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/iFT (1).yml b/regex_patterns/iFT (1).yml
deleted file mode 100644
index 5cd6a80..0000000
--- a/regex_patterns/iFT (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'iFT'
-'pattern': '(?<=^|[\s.-])iFT\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/iFT.yml b/regex_patterns/iFT.yml
index e83c22c..317911c 100644
--- a/regex_patterns/iFT.yml
+++ b/regex_patterns/iFT.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])iFT\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/iJP.yml b/regex_patterns/iJP.yml
deleted file mode 100644
index f44802e..0000000
--- a/regex_patterns/iJP.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iJP
-pattern: ^(iJP)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iKA.yml b/regex_patterns/iKA.yml
deleted file mode 100644
index 9829f39..0000000
--- a/regex_patterns/iKA.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iKA
-pattern: ^(iKA)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iKaos.yml b/regex_patterns/iKaos.yml
deleted file mode 100644
index f234b0d..0000000
--- a/regex_patterns/iKaos.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iKaos
-pattern: \b(iKaos)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iNTENSO.yml b/regex_patterns/iNTENSO.yml
deleted file mode 100644
index 22190b5..0000000
--- a/regex_patterns/iNTENSO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iNTENSO
-pattern: ^(iNTENSO)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/iNVANDRAREN (1).yml b/regex_patterns/iNVANDRAREN (1).yml
deleted file mode 100644
index 192b66d..0000000
--- a/regex_patterns/iNVANDRAREN (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'iNVANDRAREN'
-'pattern': '(?<=^|[\s.-])iNVANDRAREN\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/iNVANDRAREN.yml b/regex_patterns/iNVANDRAREN.yml
index ac5a21a..be5404a 100644
--- a/regex_patterns/iNVANDRAREN.yml
+++ b/regex_patterns/iNVANDRAREN.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])iNVANDRAREN\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/iON (1).yml b/regex_patterns/iON (1).yml
deleted file mode 100644
index 9bbc43d..0000000
--- a/regex_patterns/iON (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'iON'
-'pattern': '(?<=^|[\s.-])iON\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/iON.yml b/regex_patterns/iON.yml
index 51f0e7b..70d6741 100644
--- a/regex_patterns/iON.yml
+++ b/regex_patterns/iON.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])iON\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/iPT Internals (1).yml b/regex_patterns/iPT Internals (1).yml
deleted file mode 100644
index c5619ab..0000000
--- a/regex_patterns/iPT Internals (1).yml	
+++ /dev/null
@@ -1,42 +0,0 @@
-'description': 'Matches EVO / CMRG. Needed for the iTunes (Missing) CF. '
-'name': 'iPT Internals'
-'pattern': '(?<=^|[\s.-])CM(a)?R(io)?G|EVO\b'
-'tags':
-- 'Release Group'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': '12 Dares of Christmas 2023 1080p AMZN WEB-DL DDP 2.0 H.264-CMRG'
-  'lastRun': '2024-12-06T06:14:09.421485'
-  'matchSpan':
-    'end': 63
-    'start': 59
-  'matchedContent': 'CMRG'
-  'matchedGroups':
-  - null
-  - null
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'The.Super.Mario.Bros.Movie.2023.1080p.MA.WEB-DL.DDP5.1.Atmos.H.264-CMaRioG.mkv'
-  'lastRun': '2024-12-06T06:14:09.421485'
-  'matchSpan':
-    'end': 74
-    'start': 67
-  'matchedContent': 'CMaRioG'
-  'matchedGroups':
-  - 'a'
-  - 'io'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Aisha 2022 1080p WEB-DL DDP5 1 H 264-EVO'
-  'lastRun': '2024-12-06T06:14:09.421485'
-  'matchSpan':
-    'end': 40
-    'start': 37
-  'matchedContent': 'EVO'
-  'matchedGroups':
-  - null
-  - null
-  'passes': true
diff --git a/regex_patterns/iPUNISHER.yml b/regex_patterns/iPUNISHER.yml
deleted file mode 100644
index ebbd3c7..0000000
--- a/regex_patterns/iPUNISHER.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'iPUNISHER'
-pattern: \b(iPUNISHER)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iPlanet.yml b/regex_patterns/iPlanet.yml
deleted file mode 100644
index 56ef9bf..0000000
--- a/regex_patterns/iPlanet.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iPlanet
-pattern: ^(iPlanet)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/iQIYI (1).yml b/regex_patterns/iQIYI (1).yml
deleted file mode 100644
index e4f238b..0000000
--- a/regex_patterns/iQIYI (1).yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-'description': 'iQIYI is a Chinese subscription video on-demand over-the-top streaming
-  service owned by Baidu. Headquartered in Beijing, iQIYI primarily produces and distributes
-  films and television series.'
-'name': 'iQIYI'
-'pattern': '\b(IQIYI|IQ)\b'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/iQIYI.yml b/regex_patterns/iQIYI.yml
index 5687841..8446a6a 100644
--- a/regex_patterns/iQIYI.yml
+++ b/regex_patterns/iQIYI.yml
@@ -1,7 +1,9 @@
 name: iQIYI
-pattern: \b(iQIYI)\b
-description: iQIYI is a Chinese subscription video on-demand over-the-top streaming service owned by Baidu. Headquartered in Beijing, iQIYI primarily produces and distributes films and television series.
+pattern: \b(IQIYI|IQ)\b
+description: iQIYI is a Chinese subscription video on-demand over-the-top streaming
+  service owned by Baidu. Headquartered in Beijing, iQIYI primarily produces and distributes
+  films and television series.
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
+tests: []
diff --git a/regex_patterns/iT00NZ.yml b/regex_patterns/iT00NZ.yml
deleted file mode 100644
index 8e62522..0000000
--- a/regex_patterns/iT00NZ.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iT00NZ
-pattern: ^(iT00NZ)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/iTunes (1).yml b/regex_patterns/iTunes (1).yml
deleted file mode 100644
index 5d62801..0000000
--- a/regex_patterns/iTunes (1).yml	
+++ /dev/null
@@ -1,72 +0,0 @@
-'description': 'iTunes began offering video content in October 2005 with the release
-  of iTunes 6. At launch, the iTunes Store provided popular TV shows from ABC, Disney
-  Channel, and other networks. Users could purchase and view video content, such as
-  episodes of Desperate Housewives, Lost, That''s So Raven, and The Suite Life of
-  Zack & Cody.
-
-
-  In 2008, Apple introduced "iTunes Digital Copy," a feature on select DVDs and Blu-ray
-  discs that allowed users to obtain a digital copy of the video content in iTunes
-  and associated media players.
-
-
-  Over time, iTunes expanded its video offerings and became a significant platform
-  for purchasing, organizing, and viewing movies and TV shows.'
-'name': 'iTunes'
-'pattern': '\b(it|itunes)\b(?=[ ._-]web[ ._-]?(dl|rip)\b)'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'The 1975-iTunes Music Festival London (2013)-CONVERT-1080p-x264-2013-SRPx'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Armour of God 1987 iTunes WEB-DL 4k HEVC HDR AAC-AREY'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan':
-    'end': 25
-    'start': 19
-  'matchedContent': 'iTunes'
-  'matchedGroups':
-  - 'iTunes'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'The Celluloid Closet 1995 1080p iTunes WEB-DL H 264 AAC'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan':
-    'end': 38
-    'start': 32
-  'matchedContent': 'iTunes'
-  'matchedGroups':
-  - 'iTunes'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': '752.is.Not.A.Number.2022.2160p.iT.WEB-DL.DD5.1.HEVC-NTb.mkv'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan':
-    'end': 33
-    'start': 31
-  'matchedContent': 'iT'
-  'matchedGroups':
-  - 'iT'
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'Bring It On All or Nothing 2006 1080p BluRay DDP 5 1 x265-edge2020'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/iTunes Rename.yml b/regex_patterns/iTunes Rename.yml
index 0a9c29a..747883b 100644
--- a/regex_patterns/iTunes Rename.yml	
+++ b/regex_patterns/iTunes Rename.yml	
@@ -1,4 +1,6 @@
-'description': 'iTunes began offering video content in October 2005 with the release
+name: iTunes Rename
+pattern: \[(iT)\b|\b(iT)\]
+description: 'iTunes began offering video content in October 2005 with the release
   of iTunes 6. At launch, the iTunes Store provided popular TV shows from ABC, Disney
   Channel, and other networks. Users could purchase and view video content, such as
   episodes of Desperate Housewives, Lost, That''s So Raven, and The Suite Life of
@@ -12,61 +14,59 @@
 
   Over time, iTunes expanded its video offerings and became a significant platform
   for purchasing, organizing, and viewing movies and TV shows.'
-'name': 'iTunes Rename'
-'pattern': '\[(iT)\b|\b(iT)\]'
-'tags':
-- 'Streaming Service'
-- 'WEB-DL'
-'tests':
-- 'expected': false
-  'id': 1
-  'input': 'The 1975-iTunes Music Festival London (2013)-CONVERT-1080p-x264-2013-SRPx'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Armour of God 1987 iTunes WEB-DL 4k HEVC HDR AAC-AREY'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan':
-    'end': 25
-    'start': 19
-  'matchedContent': 'iTunes'
-  'matchedGroups':
-  - 'iTunes'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'The Celluloid Closet 1995 1080p iTunes WEB-DL H 264 AAC'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan':
-    'end': 38
-    'start': 32
-  'matchedContent': 'iTunes'
-  'matchedGroups':
-  - 'iTunes'
-  - 'DL'
-  'passes': true
-- 'expected': true
-  'id': 4
-  'input': '752.is.Not.A.Number.2022.2160p.iT.WEB-DL.DD5.1.HEVC-NTb.mkv'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan':
-    'end': 33
-    'start': 31
-  'matchedContent': 'iT'
-  'matchedGroups':
-  - 'iT'
-  - 'DL'
-  'passes': true
-- 'expected': false
-  'id': 5
-  'input': 'Bring It On All or Nothing 2006 1080p BluRay DDP 5 1 x265-edge2020'
-  'lastRun': '2024-12-06T05:44:57.921957'
-  'matchSpan': null
-  'matchedContent': null
-  'matchedGroups': []
-  'passes': true
+tags:
+- Streaming Service
+- WEB-DL
+tests:
+- expected: false
+  id: 1
+  input: The 1975-iTunes Music Festival London (2013)-CONVERT-1080p-x264-2013-SRPx
+  lastRun: '2024-12-06T05:44:57.921957'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 2
+  input: Armour of God 1987 iTunes WEB-DL 4k HEVC HDR AAC-AREY
+  lastRun: '2024-12-06T05:44:57.921957'
+  matchSpan:
+    end: 25
+    start: 19
+  matchedContent: iTunes
+  matchedGroups:
+  - iTunes
+  - DL
+  passes: true
+- expected: true
+  id: 3
+  input: The Celluloid Closet 1995 1080p iTunes WEB-DL H 264 AAC
+  lastRun: '2024-12-06T05:44:57.921957'
+  matchSpan:
+    end: 38
+    start: 32
+  matchedContent: iTunes
+  matchedGroups:
+  - iTunes
+  - DL
+  passes: true
+- expected: true
+  id: 4
+  input: 752.is.Not.A.Number.2022.2160p.iT.WEB-DL.DD5.1.HEVC-NTb.mkv
+  lastRun: '2024-12-06T05:44:57.921957'
+  matchSpan:
+    end: 33
+    start: 31
+  matchedContent: iT
+  matchedGroups:
+  - iT
+  - DL
+  passes: true
+- expected: false
+  id: 5
+  input: Bring It On All or Nothing 2006 1080p BluRay DDP 5 1 x265-edge2020
+  lastRun: '2024-12-06T05:44:57.921957'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
diff --git a/regex_patterns/iTunes.yml b/regex_patterns/iTunes.yml
index 581bc81..c01f33c 100644
--- a/regex_patterns/iTunes.yml
+++ b/regex_patterns/iTunes.yml
@@ -17,7 +17,6 @@ description: 'iTunes began offering video content in October 2005 with the relea
 tags:
 - Streaming Service
 - WEB-DL
-- WEBRip
 tests:
 - expected: false
   id: 1
diff --git a/regex_patterns/iVy.yml b/regex_patterns/iVy.yml
deleted file mode 100644
index eab7628..0000000
--- a/regex_patterns/iVy.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: iVy
-pattern: ^(iVy)$
-description: ''
-tags:
-- Release Group
-tests: null
\ No newline at end of file
diff --git a/regex_patterns/inid4c.yml b/regex_patterns/inid4c.yml
deleted file mode 100644
index 70e1095..0000000
--- a/regex_patterns/inid4c.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'inid4c'
-pattern: \b(inid4c)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/jennaortega.yml b/regex_patterns/jennaortega.yml
deleted file mode 100644
index bbddbdc..0000000
--- a/regex_patterns/jennaortega.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'jennaortega'
-pattern: '(?<!-)\\b(jennaortega(UHD)?)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/jennaortegaUHD.yml b/regex_patterns/jennaortegaUHD.yml
index 01955fc..b4f3587 100644
--- a/regex_patterns/jennaortegaUHD.yml
+++ b/regex_patterns/jennaortegaUHD.yml
@@ -1,7 +1,7 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'jennaortegaUHD'
-'pattern': '(?<=^|[\s.-])jennaortega(UHD)?\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
+name: jennaortegaUHD
+pattern: (?<=^|[\s.-])jennaortega(UHD)?\b
+description: Banned for Fake DV/HDR Layer
+tags:
+- Release Group
+- UnWanted
+tests: []
diff --git a/regex_patterns/k00kie (1).yml b/regex_patterns/k00kie (1).yml
deleted file mode 100644
index debdc00..0000000
--- a/regex_patterns/k00kie (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'k00kie'
-'pattern': '(?<=^|[\s.-])k00kie\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/k00kie.yml b/regex_patterns/k00kie.yml
index 55c3688..88614fa 100644
--- a/regex_patterns/k00kie.yml
+++ b/regex_patterns/k00kie.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])k00kie\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/kBaraka.yml b/regex_patterns/kBaraka.yml
deleted file mode 100644
index b7d0b53..0000000
--- a/regex_patterns/kBaraka.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'kBaraka'
-pattern: \b(kBaraka)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/karios.yml b/regex_patterns/karios.yml
deleted file mode 100644
index ba81ce6..0000000
--- a/regex_patterns/karios.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'karios'
-pattern: \b(karios)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/km.yml b/regex_patterns/km.yml
deleted file mode 100644
index 812db76..0000000
--- a/regex_patterns/km.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'km'
-pattern: \[km\]|-km\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/kmplx (1).yml b/regex_patterns/kmplx (1).yml
deleted file mode 100644
index f07e275..0000000
--- a/regex_patterns/kmplx (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'kmplx'
-'pattern': '(?<=^|[\s.-])kmplx\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/kmplx.yml b/regex_patterns/kmplx.yml
index 0903534..ded2f13 100644
--- a/regex_patterns/kmplx.yml
+++ b/regex_patterns/kmplx.yml
@@ -1,6 +1,7 @@
-name: 'kmplx'
-pattern: \b(kmplx)\b
+name: kmplx
+pattern: (?<=^|[\s.-])kmplx\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/kuchikirukia (1).yml b/regex_patterns/kuchikirukia (1).yml
deleted file mode 100644
index bfe8bfc..0000000
--- a/regex_patterns/kuchikirukia (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'kuchikirukia'
-'pattern': '(?<=^|[\s.-])kuchikirukia\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/kuchikirukia.yml b/regex_patterns/kuchikirukia.yml
index 9b50606..1292723 100644
--- a/regex_patterns/kuchikirukia.yml
+++ b/regex_patterns/kuchikirukia.yml
@@ -1,6 +1,7 @@
-name: 'kuchikirukia'
-pattern: \b(kuchikirukia)\b
+name: kuchikirukia
+pattern: (?<=^|[\s.-])kuchikirukia\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/luvBB (1).yml b/regex_patterns/luvBB (1).yml
deleted file mode 100644
index bc9ad68..0000000
--- a/regex_patterns/luvBB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'luvBB'
-'pattern': '(?<=^|[\s.-])luvBB\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/luvBB.yml b/regex_patterns/luvBB.yml
index 94e6245..1404a51 100644
--- a/regex_patterns/luvBB.yml
+++ b/regex_patterns/luvBB.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])luvBB\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/mHD.yml b/regex_patterns/mHD.yml
deleted file mode 100644
index 588eef6..0000000
--- a/regex_patterns/mHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: mHD
-pattern: ^(mHD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/mSD.yml b/regex_patterns/mSD.yml
deleted file mode 100644
index 20d151d..0000000
--- a/regex_patterns/mSD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: mSD
-pattern: ^(mSD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/mal-lu-zen.yml b/regex_patterns/mal-lu-zen.yml
deleted file mode 100644
index 5de4b1a..0000000
--- a/regex_patterns/mal-lu-zen.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'mal lu zen'
-pattern: \b(mal[ .-]lu[ .-]zen)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/mdcx.yml b/regex_patterns/mdcx.yml
deleted file mode 100644
index 75dc3ce..0000000
--- a/regex_patterns/mdcx.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'mdcx'
-pattern: \b(mdcx)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/micius (1).yml b/regex_patterns/micius (1).yml
deleted file mode 100644
index 1f0f907..0000000
--- a/regex_patterns/micius (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'micius'
-'pattern': '(?<=^|[\s.-])micius\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/micius.yml b/regex_patterns/micius.yml
index fc98a70..ce082c9 100644
--- a/regex_patterns/micius.yml
+++ b/regex_patterns/micius.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])micius\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Bluray
+tests: []
diff --git a/regex_patterns/mkv (1).yml b/regex_patterns/mkv (1).yml
deleted file mode 100644
index f473881..0000000
--- a/regex_patterns/mkv (1).yml	
+++ /dev/null
@@ -1,27 +0,0 @@
-'description': 'Matches MKV and MP4 containers. Helps to differentiate file names
-  from torrent names.'
-'name': 'mkv'
-'pattern': '.mkv|.mp4'
-'tags':
-- 'Container'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Full.Metal.Jacket.1987.1080p.HMAX.WEB-DL.DD5.1.HEVC-SiGLA.mkv'
-  'lastRun': '2024-12-11T05:19:13.022900'
-  'matchSpan':
-    'end': 61
-    'start': 57
-  'matchedContent': '.mkv'
-  'matchedGroups': []
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': "Don\u2019t Move \u201CDirected by Anthony Melton\u201D_HD_1920x1080_tt2846600.mp4"
-  'lastRun': '2024-12-11T05:19:13.022900'
-  'matchSpan':
-    'end': 66
-    'start': 62
-  'matchedContent': '.mp4'
-  'matchedGroups': []
-  'passes': true
diff --git a/regex_patterns/monkee (1).yml b/regex_patterns/monkee (1).yml
deleted file mode 100644
index 7008502..0000000
--- a/regex_patterns/monkee (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Matches "monkee" when preceded by whitespace, a hyphen or dot'
-'name': 'monkee'
-'pattern': '(?<=^|[\s.-])monkee\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/monkee.yml b/regex_patterns/monkee.yml
index a05532a..c161921 100644
--- a/regex_patterns/monkee.yml
+++ b/regex_patterns/monkee.yml
@@ -1,6 +1,7 @@
-name: 'monkee'
-pattern: ^(monkee)$
-description: ''
+name: monkee
+pattern: (?<=^|[\s.-])monkee\b
+description: Matches "monkee" when preceded by whitespace, a hyphen or dot
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/mottoj.yml b/regex_patterns/mottoj.yml
deleted file mode 100644
index 5deddba..0000000
--- a/regex_patterns/mottoj.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'mottoj'
-pattern: \b(mottoj)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/nHD.yml b/regex_patterns/nHD.yml
deleted file mode 100644
index 3649ba2..0000000
--- a/regex_patterns/nHD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: nHD
-pattern: ^(nHD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/nSD.yml b/regex_patterns/nSD.yml
deleted file mode 100644
index d232a08..0000000
--- a/regex_patterns/nSD.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: nSD
-pattern: ^(nSD)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/neko-raws.yml b/regex_patterns/neko-raws.yml
deleted file mode 100644
index 43b3c6b..0000000
--- a/regex_patterns/neko-raws.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'neko-raws'
-pattern: neko[ ._-]?(raws)
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/neoHEVC.yml b/regex_patterns/neoHEVC.yml
deleted file mode 100644
index 44da80d..0000000
--- a/regex_patterns/neoHEVC.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'neoHEVC'
-pattern: \b(neoHEVC)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/niizk.yml b/regex_patterns/niizk.yml
deleted file mode 100644
index 942b622..0000000
--- a/regex_patterns/niizk.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'niizk'
-pattern: \b(niizk)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/nikt0.yml b/regex_patterns/nikt0.yml
deleted file mode 100644
index a11a396..0000000
--- a/regex_patterns/nikt0.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: nikt0
-pattern: ^(nikt0)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/nmd (1).yml b/regex_patterns/nmd (1).yml
deleted file mode 100644
index fc4e1df..0000000
--- a/regex_patterns/nmd (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'nmd'
-'pattern': '(?<=^|[\s.-])nmd\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/nmd.yml b/regex_patterns/nmd.yml
index fd6b719..7c4ba7d 100644
--- a/regex_patterns/nmd.yml
+++ b/regex_patterns/nmd.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])nmd\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/orbitron.yml b/regex_patterns/orbitron.yml
deleted file mode 100644
index 5f59bab..0000000
--- a/regex_patterns/orbitron.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: orbitron
-pattern: ^(orbitron)$
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/orz.yml b/regex_patterns/orz.yml
deleted file mode 100644
index e716e84..0000000
--- a/regex_patterns/orz.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'orz'
-pattern: \b(orz)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/peachflavored.yml b/regex_patterns/peachflavored.yml
deleted file mode 100644
index 3a88fbc..0000000
--- a/regex_patterns/peachflavored.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'peachflavored'
-pattern: \b(peachflavored)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/phazer11.yml b/regex_patterns/phazer11.yml
deleted file mode 100644
index 37a299e..0000000
--- a/regex_patterns/phazer11.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'phazer11'
-pattern: \b(phazer11)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/playBD (1).yml b/regex_patterns/playBD (1).yml
deleted file mode 100644
index 831435f..0000000
--- a/regex_patterns/playBD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'playBD'
-'pattern': '(?<=^|[\s.-])playBD\b'
-'tags':
-- 'Release Group'
-- 'Remux'
-'tests': []
diff --git a/regex_patterns/playBD.yml b/regex_patterns/playBD.yml
index 6569616..5010b23 100644
--- a/regex_patterns/playBD.yml
+++ b/regex_patterns/playBD.yml
@@ -1,6 +1,7 @@
-name: 'playBD'
-pattern: ^(playBD)$
+name: playBD
+pattern: (?<=^|[\s.-])playBD\b
 description: ''
 tags:
 - Release Group
+- Remux
 tests: []
diff --git a/regex_patterns/playHD (1).yml b/regex_patterns/playHD (1).yml
deleted file mode 100644
index 11e45c5..0000000
--- a/regex_patterns/playHD (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'playHD'
-'pattern': '(?<=^|[\s.-])playHD\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/playHD.yml b/regex_patterns/playHD.yml
index 0dac1ca..e81b4a2 100644
--- a/regex_patterns/playHD.yml
+++ b/regex_patterns/playHD.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])playHD\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/playWEB (1).yml b/regex_patterns/playWEB (1).yml
deleted file mode 100644
index 114d725..0000000
--- a/regex_patterns/playWEB (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'playWEB'
-'pattern': '(?<=^|[\s.-])playWEB\b'
-'tags':
-- 'Release Group'
-- 'WEB-DL'
-'tests': []
diff --git a/regex_patterns/playWEB.yml b/regex_patterns/playWEB.yml
index c4f032f..1adf162 100644
--- a/regex_patterns/playWEB.yml
+++ b/regex_patterns/playWEB.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])playWEB\b
 description: ''
 tags:
 - Release Group
+- WEB-DL
 tests: []
diff --git a/regex_patterns/pog42 (1).yml b/regex_patterns/pog42 (1).yml
deleted file mode 100644
index b36427e..0000000
--- a/regex_patterns/pog42 (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'pog42'
-'pattern': '(?<=^|[\s.-])pog42\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/pog42.yml b/regex_patterns/pog42.yml
index 58d0830..0019b59 100644
--- a/regex_patterns/pog42.yml
+++ b/regex_patterns/pog42.yml
@@ -1,6 +1,7 @@
 name: pog42
-pattern: \b(pog42)\b
+pattern: (?<=^|[\s.-])pog42\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/pyroneko.yml b/regex_patterns/pyroneko.yml
deleted file mode 100644
index fe6aeca..0000000
--- a/regex_patterns/pyroneko.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: pyroneko
-pattern: \b(pyroneko)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/rightSIZE (1).yml b/regex_patterns/rightSIZE (1).yml
deleted file mode 100644
index 4a2e0e2..0000000
--- a/regex_patterns/rightSIZE (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'rightSIZE'
-'pattern': '(?<=^|[\s.-])rightSIZE\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/rightSIZE.yml b/regex_patterns/rightSIZE.yml
index cb2da28..9806c72 100644
--- a/regex_patterns/rightSIZE.yml
+++ b/regex_patterns/rightSIZE.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])rightSIZE\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/rttr (1).yml b/regex_patterns/rttr (1).yml
deleted file mode 100644
index 80bd1ee..0000000
--- a/regex_patterns/rttr (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'rttr'
-'pattern': '(?<=^|[\s.-])rttr\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/rttr.yml b/regex_patterns/rttr.yml
index 35f5d9f..a3322a1 100644
--- a/regex_patterns/rttr.yml
+++ b/regex_patterns/rttr.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])rttr\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/sam (1).yml b/regex_patterns/sam (1).yml
deleted file mode 100644
index e433cce..0000000
--- a/regex_patterns/sam (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'sam'
-'pattern': '(?<=^|[\s.-])sam\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/sam.yml b/regex_patterns/sam.yml
index 6f6183f..58863ed 100644
--- a/regex_patterns/sam.yml
+++ b/regex_patterns/sam.yml
@@ -1,6 +1,7 @@
 name: sam
-pattern: \[sam\]|-sam\b
+pattern: (?<=^|[\s.-])sam\b
 description: ''
 tags:
 - Release Group
-tests: null
+- Anime
+tests: []
diff --git a/regex_patterns/sekkusu&ok.yml b/regex_patterns/sekkusu&ok.yml
deleted file mode 100644
index 7d78f87..0000000
--- a/regex_patterns/sekkusu&ok.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'sekkusu&ok'
-pattern: \b(sekkusu&ok)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/smol (1).yml b/regex_patterns/smol (1).yml
deleted file mode 100644
index 1725c77..0000000
--- a/regex_patterns/smol (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'smol'
-'pattern': '(?<=^|[\s.-])smol\b'
-'tags':
-- 'Release Group'
-- 'Anime'
-'tests': []
diff --git a/regex_patterns/smol.yml b/regex_patterns/smol.yml
index 7f5151b..adfff5c 100644
--- a/regex_patterns/smol.yml
+++ b/regex_patterns/smol.yml
@@ -1,6 +1,7 @@
 name: smol
-pattern: \[smol\]|-smol\b
+pattern: (?<=^|[\s.-])smol\b
 description: ''
 tags:
 - Release Group
+- Anime
 tests: []
diff --git a/regex_patterns/tarunk9c (1).yml b/regex_patterns/tarunk9c (1).yml
deleted file mode 100644
index 85be505..0000000
--- a/regex_patterns/tarunk9c (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': 'Banned for Fake DV/HDR Layer'
-'name': 'tarunk9c'
-'pattern': '(?<=^|[\s.-])tarunk9c\b'
-'tags':
-- 'Release Group'
-- 'UnWanted'
-'tests': []
diff --git a/regex_patterns/tarunk9c.yml b/regex_patterns/tarunk9c.yml
index 8d81e29..d6053fa 100644
--- a/regex_patterns/tarunk9c.yml
+++ b/regex_patterns/tarunk9c.yml
@@ -1,6 +1,7 @@
-name: 'tarunk9c'
-pattern: '^(tarunk9c)$'
-description: ''
+name: tarunk9c
+pattern: (?<=^|[\s.-])tarunk9c\b
+description: Banned for Fake DV/HDR Layer
 tags:
 - Release Group
+- UnWanted
 tests: []
diff --git a/regex_patterns/torenter69.yml b/regex_patterns/torenter69.yml
deleted file mode 100644
index 2274b91..0000000
--- a/regex_patterns/torenter69.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: torenter69
-pattern: \b(torenter69)\b
-description: ''
-tags: []
-tests: []
diff --git a/regex_patterns/v0.yml b/regex_patterns/v0.yml
deleted file mode 100644
index 49484ff..0000000
--- a/regex_patterns/v0.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'v0'
-pattern: '(\\b|\\d)(v0)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/v1.yml b/regex_patterns/v1.yml
deleted file mode 100644
index fbc3fbb..0000000
--- a/regex_patterns/v1.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'v1'
-pattern: '(\\b|\\d)(v1)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/v2.yml b/regex_patterns/v2.yml
deleted file mode 100644
index 8930f4c..0000000
--- a/regex_patterns/v2.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'v2'
-pattern: '(\\b|\\d)(v2)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/v3.yml b/regex_patterns/v3.yml
deleted file mode 100644
index 7b0af43..0000000
--- a/regex_patterns/v3.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'v3'
-pattern: '(\\b|\\d)(v3)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/v4.yml b/regex_patterns/v4.yml
deleted file mode 100644
index ba2b24b..0000000
--- a/regex_patterns/v4.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'v4'
-pattern: '(\\b|\\d)(v4)\\b'
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/x0r.yml b/regex_patterns/x0r.yml
deleted file mode 100644
index a7172d4..0000000
--- a/regex_patterns/x0r.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: x0r
-pattern: ^(x0r)$
-description: ''
-tags:
-- Release Group
-tests: null
diff --git a/regex_patterns/x264 (1).yml b/regex_patterns/x264 (1).yml
deleted file mode 100644
index 393a8e1..0000000
--- a/regex_patterns/x264 (1).yml	
+++ /dev/null
@@ -1,80 +0,0 @@
-'description': 'An open source encoder that produces H.264 videos. '
-'name': 'x264'
-'pattern': '^(?!.*(?i:remux)).*([xh](\.?264)|DVDRip)'
-'tags':
-- 'Encoder'
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Dan Da Dan AKA Dandadan S01E10 1080p CR WEB-DL AAC 2.0 x264-SubsPlease'
-  'lastRun': '2024-12-07T00:22:39.865345'
-  'matchSpan':
-    'end': 59
-    'start': 0
-  'matchedContent': 'Dan Da Dan AKA Dandadan S01E10 1080p CR WEB-DL AAC 2.0 x264'
-  'matchedGroups':
-  - 'x264'
-  - '264'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Life of Pi 2012 1080p BluRay x264-SPARKS'
-  'lastRun': '2024-12-07T00:22:39.865345'
-  'matchSpan':
-    'end': 33
-    'start': 0
-  'matchedContent': 'Life of Pi 2012 1080p BluRay x264'
-  'matchedGroups':
-  - 'x264'
-  - '264'
-  'passes': true
-- 'expected': false
-  'id': 3
-  'input': 'Scrubs (2001) S04 REPACK (1080p AIUS DVDRip x265 10bit AC3 5 1 English
-    - JBENT)[TAoE]'
-  'lastRun': '2024-12-07T00:22:39.865345'
-  'matchSpan':
-    'end': 43
-    'start': 0
-  'matchedContent': 'Scrubs (2001) S04 REPACK (1080p AIUS DVDRip'
-  'matchedGroups':
-  - 'DVDRip'
-  - null
-  'passes': false
-- 'expected': false
-  'id': 4
-  'input': 'Wallander UK S01-S04 DVDRip XviD BDRip x264-Scene (2008-2016)'
-  'lastRun': '2024-12-07T00:22:39.865345'
-  'matchSpan':
-    'end': 43
-    'start': 0
-  'matchedContent': 'Wallander UK S01-S04 DVDRip XviD BDRip x264'
-  'matchedGroups':
-  - 'x264'
-  - '264'
-  'passes': false
-- 'expected': false
-  'id': 5
-  'input': 'Rugrats S05 480p DVDRip Opus 2.0 AV1-Jenkins'
-  'lastRun': '2024-12-07T00:22:39.865345'
-  'matchSpan':
-    'end': 23
-    'start': 0
-  'matchedContent': 'Rugrats S05 480p DVDRip'
-  'matchedGroups':
-  - 'DVDRip'
-  - null
-  'passes': false
-- 'expected': true
-  'id': 6
-  'input': '_Summer S00 JAPANESE 480p DVDRip DD 2.0 x264-Tsundere'
-  'lastRun': '2024-12-07T00:22:39.865345'
-  'matchSpan':
-    'end': 44
-    'start': 0
-  'matchedContent': '_Summer S00 JAPANESE 480p DVDRip DD 2.0 x264'
-  'matchedGroups':
-  - 'x264'
-  - '264'
-  'passes': true
diff --git a/regex_patterns/x265 (1).yml b/regex_patterns/x265 (1).yml
deleted file mode 100644
index e191f71..0000000
--- a/regex_patterns/x265 (1).yml	
+++ /dev/null
@@ -1,46 +0,0 @@
-'description': 'An open source encoder that produces H.265 videos. '
-'name': 'x265'
-'pattern': '^(?!.*(?i:remux))(?=.*([x]\s?(\.?265)\b|HEVC|\bDS4K\b)).*$'
-'tags':
-- 'Encoder'
-- 'Codec'
-'tests':
-- 'expected': true
-  'id': 1
-  'input': 'Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0 English
-    - r00t QxR)'
-  'lastRun': '2025-01-14T10:24:52.457470'
-  'matchSpan':
-    'end': 83
-    'start': 0
-  'matchedContent': 'Aqua Teen Hunger Force (2000) S00E13 (480p DVD x265 SDR AAC 2.0
-    English - r00t QxR)'
-  'matchedGroups':
-  - 'x265'
-  - '265'
-  'passes': true
-- 'expected': true
-  'id': 2
-  'input': 'Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio'
-  'lastRun': '2025-01-14T10:24:52.457470'
-  'matchSpan':
-    'end': 68
-    'start': 0
-  'matchedContent': 'Planet Earth II S01 REPACK UHD BluRay 2160p DD5.1 HDR x265-BHDStudio'
-  'matchedGroups':
-  - 'x265'
-  - '265'
-  'passes': true
-- 'expected': true
-  'id': 3
-  'input': 'Spider-Man Across the Spider-Verse 2023 1080p UHD BluRay DDP7 1 DoVi HDR10x265-c0kE'
-  'lastRun': '2025-01-14T10:24:52.457470'
-  'matchSpan':
-    'end': 83
-    'start': 0
-  'matchedContent': 'Spider-Man Across the Spider-Verse 2023 1080p UHD BluRay DDP7
-    1 DoVi HDR10x265-c0kE'
-  'matchedGroups':
-  - 'x265'
-  - '265'
-  'passes': true
diff --git a/regex_patterns/xPearse.yml b/regex_patterns/xPearse.yml
deleted file mode 100644
index fb56779..0000000
--- a/regex_patterns/xPearse.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'xPearse'
-pattern: \b(xPearse)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/xander (1).yml b/regex_patterns/xander (1).yml
deleted file mode 100644
index 1623594..0000000
--- a/regex_patterns/xander (1).yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-'description': ''
-'name': 'xander'
-'pattern': '(?<=^|[\s.-])xander\b'
-'tags':
-- 'Release Group'
-- 'Bluray'
-'tests': []
diff --git a/regex_patterns/xander.yml b/regex_patterns/xander.yml
index ff3147e..2c3bffd 100644
--- a/regex_patterns/xander.yml
+++ b/regex_patterns/xander.yml
@@ -3,4 +3,5 @@ pattern: (?<=^|[\s.-])xander\b
 description: ''
 tags:
 - Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/xiao-av1.yml b/regex_patterns/xiao-av1.yml
deleted file mode 100644
index ef26b1c..0000000
--- a/regex_patterns/xiao-av1.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'xiao-av1'
-pattern: \b(xiao-av1)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/youshikibi.yml b/regex_patterns/youshikibi.yml
deleted file mode 100644
index a62c296..0000000
--- a/regex_patterns/youshikibi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'youshikibi'
-pattern: \b(youshikibi)\b
-description: ''
-tags:
-- Release Group
-tests: []
diff --git a/regex_patterns/zza.yml b/regex_patterns/zza.yml
deleted file mode 100644
index e81a37e..0000000
--- a/regex_patterns/zza.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'zza'
-pattern: \[zza\]|-zza\b
-description: ''
-tags:
-- Release Group
-tests: []