diff --git a/custom_formats/1080p Efficient TV Bluray Tier 1.yml b/custom_formats/1080p Efficient TV Bluray Tier 1.yml
index 083dd09..98107bc 100644
--- a/custom_formats/1080p Efficient TV Bluray Tier 1.yml	
+++ b/custom_formats/1080p Efficient TV Bluray Tier 1.yml	
@@ -26,11 +26,6 @@ conditions:
   pattern: QxR
   required: false
   type: release_group
-- name: TAoE
-  negate: false
-  pattern: TAoE
-  required: false
-  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Efficient TV Bluray Tier 2.yml b/custom_formats/1080p Efficient TV Bluray Tier 2.yml
index 09f7ddb..8f3d8cc 100644
--- a/custom_formats/1080p Efficient TV Bluray Tier 2.yml	
+++ b/custom_formats/1080p Efficient TV Bluray Tier 2.yml	
@@ -41,11 +41,6 @@ conditions:
   pattern: MNHD
   required: false
   type: release_group
-- name: Vialle
-  negate: false
-  pattern: Vialle
-  required: false
-  type: release_group
 tests:
 - conditionResults:
   - matches: true
diff --git a/custom_formats/1080p Golden Popcorn.yml b/custom_formats/1080p Golden Popcorn.yml
index f028c8b..2622fdc 100644
--- a/custom_formats/1080p Golden Popcorn.yml	
+++ b/custom_formats/1080p Golden Popcorn.yml	
@@ -14,4 +14,9 @@ conditions:
   negate: false
   required: true
   type: indexer_flag
+- name: Release Groups
+  type: release_group
+  required: true
+  negate: true
+  pattern: Golden Popcorn Negation
 tests: []
diff --git a/custom_formats/1080p Quality Tier 1.yml b/custom_formats/1080p Quality Tier 1.yml
index 01e7e2a..7bd0902 100644
--- a/custom_formats/1080p Quality Tier 1.yml	
+++ b/custom_formats/1080p Quality Tier 1.yml	
@@ -17,10 +17,10 @@ conditions:
   required: true
   type: release_title
 - name: Bluray
-  type: source
-  required: false
   negate: false
+  required: false
   source: bluray
+  type: source
 - name: WEBRip
   negate: false
   required: false
@@ -41,4 +41,14 @@ conditions:
   pattern: EbP
   required: false
   type: release_group
+- name: TeamSyndicate
+  type: release_group
+  required: false
+  negate: false
+  pattern: TeamSyndicate
+- name: ZoroSenpai
+  type: release_group
+  required: false
+  negate: false
+  pattern: ZoroSenpai
 tests: []
diff --git a/custom_formats/1080p Quality Tier 2.yml b/custom_formats/1080p Quality Tier 2.yml
index 11ae4cf..6197dc8 100644
--- a/custom_formats/1080p Quality Tier 2.yml	
+++ b/custom_formats/1080p Quality Tier 2.yml	
@@ -17,10 +17,10 @@ conditions:
   required: true
   type: release_title
 - name: Bluray
-  type: source
-  required: false
   negate: false
+  required: false
   source: bluray
+  type: source
 - name: WEBRip
   negate: false
   required: false
@@ -46,6 +46,21 @@ conditions:
   pattern: HiFi
   required: false
   type: release_group
+- name: REBORN
+  negate: false
+  pattern: REBORN
+  required: false
+  type: release_group
+- name: SA89
+  negate: false
+  pattern: SA89
+  required: false
+  type: release_group
+- name: SoLaR
+  type: release_group
+  required: false
+  negate: false
+  pattern: SoLaR
 - name: TayTo
   negate: false
   pattern: TayTo
@@ -56,11 +71,6 @@ conditions:
   pattern: VietHD
   required: false
   type: release_group
-- name: ZoroSenpai
-  negate: false
-  pattern: ZoroSenpai
-  required: false
-  type: release_group
 - name: ZQ
   negate: false
   pattern: ZQ
diff --git a/custom_formats/1080p Quality Tier 3.yml b/custom_formats/1080p Quality Tier 3.yml
index 5825927..3da749b 100644
--- a/custom_formats/1080p Quality Tier 3.yml	
+++ b/custom_formats/1080p Quality Tier 3.yml	
@@ -56,11 +56,6 @@ conditions:
   pattern: iFT
   required: false
   type: release_group
-- name: SA89
-  negate: false
-  pattern: SA89
-  required: false
-  type: release_group
 - name: WMING
   negate: false
   pattern: WMING
diff --git a/custom_formats/1080p Quality Tier 4.yml b/custom_formats/1080p Quality Tier 4.yml
index cbd6d69..acb5148 100644
--- a/custom_formats/1080p Quality Tier 4.yml	
+++ b/custom_formats/1080p Quality Tier 4.yml	
@@ -56,6 +56,11 @@ conditions:
   pattern: NCmt
   required: false
   type: release_group
+- name: Skazhutin
+  type: release_group
+  required: false
+  negate: false
+  pattern: Skazhutin
 - name: NTb
   negate: false
   pattern: NTb
diff --git a/custom_formats/1080p Quality Tier 5.yml b/custom_formats/1080p Quality Tier 5.yml
index 750b595..c655c26 100644
--- a/custom_formats/1080p Quality Tier 5.yml	
+++ b/custom_formats/1080p Quality Tier 5.yml	
@@ -36,6 +36,11 @@ conditions:
   pattern: ATELiER
   required: false
   type: release_group
+- name: BSTD
+  negate: false
+  pattern: BSTD
+  required: false
+  type: release_group
 - name: BV
   negate: false
   pattern: BV
@@ -51,6 +56,11 @@ conditions:
   pattern: CJ
   required: false
   type: release_group
+- name: coffee
+  negate: false
+  pattern: coffee
+  required: false
+  type: release_group
 - name: CRX
   negate: false
   pattern: CRX
@@ -61,16 +71,21 @@ conditions:
   pattern: Dariush
   required: false
   type: release_group
-- name: E.N.D
-  negate: false
-  pattern: E.N.D
-  required: false
-  type: release_group
 - name: E1
   negate: false
   pattern: E1
   required: false
   type: release_group
+- name: EA
+  type: release_group
+  required: false
+  negate: false
+  pattern: EA
+- name: E.N.D
+  negate: false
+  pattern: E.N.D
+  required: false
+  type: release_group
 - name: EDPH
   negate: false
   pattern: EDPH
@@ -86,21 +101,11 @@ conditions:
   pattern: EXCiSION
   required: false
   type: release_group
-- name: FilmHD
-  negate: false
-  pattern: FilmHD
-  required: false
-  type: release_group
 - name: FraMeSToR
   negate: false
   pattern: FraMeSToR
   required: false
   type: release_group
-- name: FTW-HD
-  negate: false
-  pattern: FTW-HD
-  required: false
-  type: release_group
 - name: GALAXY
   negate: false
   pattern: GALAXY
@@ -111,24 +116,14 @@ conditions:
   pattern: GS88
   required: false
   type: release_group
-- name: HANDJOB
-  negate: false
-  pattern: HANDJOB
-  required: false
-  type: release_group
 - name: hdalx
   negate: false
   pattern: hdalx
   required: false
   type: release_group
-- name: HDC
+- name: HQMUX
   negate: false
-  pattern: HDC
-  required: false
-  type: release_group
-- name: iON
-  negate: false
-  pattern: iON
+  pattern: HQMUX
   required: false
   type: release_group
 - name: KASHMiR
@@ -141,11 +136,6 @@ conditions:
   pattern: Kitsune
   required: false
   type: release_group
-- name: LEGi0N
-  negate: false
-  pattern: LEGi0N
-  required: false
-  type: release_group
 - name: LiNG
   negate: false
   pattern: LiNG
@@ -161,9 +151,9 @@ conditions:
   pattern: luvBB
   required: false
   type: release_group
-- name: MTeam
+- name: NiBuRu
   negate: false
-  pattern: MTeam
+  pattern: NiBuRu
   required: false
   type: release_group
 - name: nmd
@@ -181,11 +171,6 @@ conditions:
   pattern: ORiGEN
   required: false
   type: release_group
-- name: P0W4HD
-  negate: false
-  pattern: P0W4HD
-  required: false
-  type: release_group
 - name: Penumbra
   negate: false
   pattern: Penumbra
@@ -206,9 +191,9 @@ conditions:
   pattern: PTer
   required: false
   type: release_group
-- name: REBORN
+- name: RiCO
   negate: false
-  pattern: REBORN
+  pattern: RiCO
   required: false
   type: release_group
 - name: rightSIZE
@@ -216,6 +201,11 @@ conditions:
   pattern: rightSIZE
   required: false
   type: release_group
+- name: RO
+  negate: false
+  pattern: RO
+  required: false
+  type: release_group
 - name: rttr
   negate: false
   pattern: rttr
@@ -236,11 +226,6 @@ conditions:
   pattern: SiMPLE
   required: false
   type: release_group
-- name: SoLaR
-  negate: false
-  pattern: SoLaR
-  required: false
-  type: release_group
 - name: SOP
   negate: false
   pattern: SOP
@@ -261,11 +246,6 @@ conditions:
   pattern: TDD
   required: false
   type: release_group
-- name: TeamSyndicate
-  type: release_group
-  required: false
-  negate: false
-  pattern: TeamSyndicate
 - name: TnP
   negate: false
   pattern: TnP
@@ -281,9 +261,9 @@ conditions:
   pattern: W4NK3R
   required: false
   type: release_group
-- name: WiKi
+- name: WiLF
   negate: false
-  pattern: WiKi
+  pattern: WiLF
   required: false
   type: release_group
 - name: xander
diff --git a/custom_formats/1080p Quality Tier 6.yml b/custom_formats/1080p Quality Tier 6.yml
new file mode 100644
index 0000000..7813daf
--- /dev/null
+++ b/custom_formats/1080p Quality Tier 6.yml	
@@ -0,0 +1,119 @@
+name: 1080p Quality Tier 6
+description: Matches release groups who fall under 1080p GPPi Tier 6
+tags:
+- GPPi
+- Release Group Tier
+- 1080p
+- Quality
+conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
+- name: EuReKA
+  negate: false
+  pattern: EuReKA
+  required: false
+  type: release_group
+- name: HANDJOB
+  negate: false
+  pattern: HANDJOB
+  required: false
+  type: release_group
+- name: HDC
+  negate: false
+  pattern: HDC
+  required: false
+  type: release_group
+- name: iON
+  negate: false
+  pattern: iON
+  required: false
+  type: release_group
+- name: Ivandro
+  negate: false
+  pattern: Ivandro
+  required: false
+  type: release_group
+- name: KnG
+  negate: false
+  pattern: KnG
+  required: false
+  type: release_group
+- name: LEGi0N
+  negate: false
+  pattern: LEGi0N
+  required: false
+  type: release_group
+- name: Lulz
+  negate: false
+  pattern: Lulz
+  required: false
+  type: release_group
+- name: MaG
+  negate: false
+  pattern: MaG
+  required: false
+  type: release_group
+- name: MTeam
+  negate: false
+  pattern: MTeam
+  required: false
+  type: release_group
+- name: NiP
+  negate: false
+  pattern: NiP
+  required: false
+  type: release_group
+- name: P0W4HD
+  negate: false
+  pattern: P0W4HD
+  required: false
+  type: release_group
+- name: PTP
+  negate: false
+  pattern: PTP
+  required: false
+  type: release_group
+- name: ROCiNANTE
+  negate: false
+  pattern: ROCiNANTE
+  required: false
+  type: release_group
+- name: Slappy
+  negate: false
+  pattern: Slappy
+  required: false
+  type: release_group
+- name: ThD
+  negate: false
+  pattern: ThD
+  required: false
+  type: release_group
+- name: WiKi
+  negate: false
+  pattern: WiKi
+  required: false
+  type: release_group
+- name: WiLDCAT
+  negate: false
+  pattern: WiLDCAT
+  required: false
+  type: release_group
+tests: []
diff --git a/custom_formats/2160p Quality Tier 1.yml b/custom_formats/2160p Quality Tier 1.yml
index a6a2e51..0c1448a 100644
--- a/custom_formats/2160p Quality Tier 1.yml	
+++ b/custom_formats/2160p Quality Tier 1.yml	
@@ -15,6 +15,11 @@ conditions:
   required: true
   source: bluray
   type: source
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 - name: CtrlHD
   negate: false
   pattern: CtrlHD
diff --git a/custom_formats/2160p Quality Tier 2.yml b/custom_formats/2160p Quality Tier 2.yml
index 18ad1cd..60a4827 100644
--- a/custom_formats/2160p Quality Tier 2.yml	
+++ b/custom_formats/2160p Quality Tier 2.yml	
@@ -15,6 +15,11 @@ conditions:
   required: true
   source: bluray
   type: source
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 - name: c0kE
   negate: false
   pattern: c0kE
@@ -31,8 +36,8 @@ conditions:
   required: false
   type: release_group
 - name: PTer
-  type: release_group
-  required: false
   negate: false
   pattern: PTer
+  required: false
+  type: release_group
 tests: []
diff --git a/custom_formats/2160p Quality Tier 3.yml b/custom_formats/2160p Quality Tier 3.yml
index c9f5ab8..793ec63 100644
--- a/custom_formats/2160p Quality Tier 3.yml	
+++ b/custom_formats/2160p Quality Tier 3.yml	
@@ -15,6 +15,11 @@ conditions:
   required: true
   source: bluray
   type: source
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 - name: BV
   negate: false
   pattern: BV
@@ -35,6 +40,11 @@ conditions:
   pattern: SoLaR
   required: false
   type: release_group
+- name: TnP
+  negate: false
+  pattern: TnP
+  required: false
+  type: release_group
 - name: W4NK3R
   negate: false
   pattern: W4NK3R
diff --git a/custom_formats/2160p Quality Tier 4.yml b/custom_formats/2160p Quality Tier 4.yml
index 9582188..8e052f5 100644
--- a/custom_formats/2160p Quality Tier 4.yml	
+++ b/custom_formats/2160p Quality Tier 4.yml	
@@ -15,14 +15,29 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: b0mbardiers
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: BlzT
   negate: false
-  pattern: b0mbardiers
+  pattern: BlzT
   required: false
   type: release_group
-- name: DEPTH
+- name: BSTD
   negate: false
-  pattern: DEPTH
+  pattern: BSTD
+  required: false
+  type: release_group
+- name: EDPH
+  negate: false
+  pattern: EDPH
+  required: false
+  type: release_group
+- name: ESiR
+  negate: false
+  pattern: ESiR
   required: false
   type: release_group
 - name: HiDt
@@ -36,15 +51,20 @@ conditions:
   required: false
   type: release_group
 - name: Kitsune
-  type: release_group
-  required: false
   negate: false
   pattern: Kitsune
+  required: false
+  type: release_group
 - name: NCmt
   negate: false
   pattern: NCmt
   required: false
   type: release_group
+- name: NTb
+  type: release_group
+  required: false
+  negate: false
+  pattern: NTb
 - name: SPHD
   negate: false
   pattern: SPHD
diff --git a/custom_formats/2160p Quality Tier 5.yml b/custom_formats/2160p Quality Tier 5.yml
index 2d79b7c..cbd73eb 100644
--- a/custom_formats/2160p Quality Tier 5.yml	
+++ b/custom_formats/2160p Quality Tier 5.yml	
@@ -15,19 +15,19 @@ conditions:
   required: true
   source: bluray
   type: source
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
 - name: 4KDVS
   negate: false
   pattern: 4KDVS
   required: false
   type: release_group
-- name: BlzT
+- name: b0mbardiers
   negate: false
-  pattern: BlzT
-  required: false
-  type: release_group
-- name: BSTD
-  negate: false
-  pattern: BSTD
+  pattern: b0mbardiers
   required: false
   type: release_group
 - name: DEFLATE
@@ -35,19 +35,19 @@ conditions:
   pattern: DEFLATE
   required: false
   type: release_group
+- name: DEPTH
+  negate: false
+  pattern: DEPTH
+  required: false
+  type: release_group
 - name: JustWatch
   negate: false
   pattern: JustWatch
   required: false
   type: release_group
 - name: SURCODE
-  type: release_group
-  required: false
   negate: false
   pattern: SURCODE
-- name: TnP
-  negate: false
-  pattern: TnP
   required: false
   type: release_group
 - name: WATCHABLE
@@ -55,4 +55,9 @@ conditions:
   pattern: WATCHABLE
   required: false
   type: release_group
+- name: WiKi
+  type: release_group
+  required: false
+  negate: false
+  pattern: WiKi
 tests: []
diff --git a/custom_formats/2160p Quality Tier 6.yml b/custom_formats/2160p Quality Tier 6.yml
index abc31ec..605e8f1 100644
--- a/custom_formats/2160p Quality Tier 6.yml	
+++ b/custom_formats/2160p Quality Tier 6.yml	
@@ -15,16 +15,11 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: AAAUHD
-  negate: false
-  pattern: AAAUHD
-  required: false
-  type: release_group
-- name: Absinth
-  negate: false
-  pattern: Absinth
-  required: false
-  type: release_group
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 - name: ADE
   negate: false
   pattern: ADE
@@ -40,6 +35,11 @@ conditions:
   pattern: beAst
   required: false
   type: release_group
+- name: BeiTai
+  negate: false
+  pattern: BeiTai
+  required: false
+  type: release_group
 - name: CHD
   negate: false
   pattern: CHD
@@ -50,9 +50,9 @@ conditions:
   pattern: CMCT
   required: false
   type: release_group
-- name: EDPH
+- name: dkore
   negate: false
-  pattern: EDPH
+  pattern: dkore
   required: false
   type: release_group
 - name: EMERALD
@@ -60,14 +60,9 @@ conditions:
   pattern: EMERALD
   required: false
   type: release_group
-- name: ESiR
+- name: FLAME
   negate: false
-  pattern: ESiR
-  required: false
-  type: release_group
-- name: FRDS
-  negate: false
-  pattern: FRDS
+  pattern: FLAME
   required: false
   type: release_group
 - name: GUHZER
@@ -75,11 +70,6 @@ conditions:
   pattern: GUHZER
   required: false
   type: release_group
-- name: HD77
-  negate: false
-  pattern: HD77
-  required: false
-  type: release_group
 - name: HDChina
   negate: false
   pattern: HDChina
@@ -90,11 +80,6 @@ conditions:
   pattern: HDmux
   required: false
   type: release_group
-- name: HUNTJR
-  negate: false
-  pattern: HUNTJR
-  required: false
-  type: release_group
 - name: HypStu
   negate: false
   pattern: HypStu
@@ -105,31 +90,11 @@ conditions:
   pattern: IAMABLE
   required: false
   type: release_group
-- name: iCandy
-  negate: false
-  pattern: iCandy
-  required: false
-  type: release_group
-- name: iNVANDRAREN
-  negate: false
-  pattern: iNVANDRAREN
-  required: false
-  type: release_group
-- name: k00kie
-  negate: false
-  pattern: k00kie
-  required: false
-  type: release_group
 - name: KAN3D2M
   negate: false
   pattern: KAN3D2M
   required: false
   type: release_group
-- name: KNiVES
-  negate: false
-  pattern: KNiVES
-  required: false
-  type: release_group
 - name: LAZARUS
   negate: false
   pattern: LAZARUS
@@ -155,26 +120,11 @@ conditions:
   pattern: ReQuEsT
   required: false
   type: release_group
-- name: SMAHAWUG
-  negate: false
-  pattern: SMAHAWUG
-  required: false
-  type: release_group
-- name: SPECTACLE
-  negate: false
-  pattern: SPECTACLE
-  required: false
-  type: release_group
 - name: STRiKES
   negate: false
   pattern: STRiKES
   required: false
   type: release_group
-- name: SWAGGERUHD
-  negate: false
-  pattern: SWAGGERUHD
-  required: false
-  type: release_group
 - name: SWTYBLZ
   negate: false
   pattern: SWTYBLZ
@@ -185,26 +135,11 @@ conditions:
   pattern: TERMiNAL
   required: false
   type: release_group
-- name: TOMBCRUISE
-  negate: false
-  pattern: TOMBCRUISE
-  required: false
-  type: release_group
-- name: Tron
-  negate: false
-  pattern: Tron
-  required: false
-  type: release_group
 - name: ULTRAHDCLUB
   negate: false
   pattern: ULTRAHDCLUB
   required: false
   type: release_group
-- name: VALiS
-  negate: false
-  pattern: VALiS
-  required: false
-  type: release_group
 - name: Whiterhino
   negate: false
   pattern: WhiteRhino
diff --git a/custom_formats/720p Golden Popcorn.yml b/custom_formats/720p Golden Popcorn.yml
index 7eb75cd..e56c19a 100644
--- a/custom_formats/720p Golden Popcorn.yml	
+++ b/custom_formats/720p Golden Popcorn.yml	
@@ -14,4 +14,9 @@ conditions:
   negate: false
   required: true
   type: indexer_flag
+- name: Release Groups
+  type: release_group
+  required: true
+  negate: true
+  pattern: Golden Popcorn Negation
 tests: []
diff --git a/custom_formats/720p Quality Tier 1.yml b/custom_formats/720p Quality Tier 1.yml
index 6c2c54d..33a6ce4 100644
--- a/custom_formats/720p Quality Tier 1.yml	
+++ b/custom_formats/720p Quality Tier 1.yml	
@@ -11,16 +11,21 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
 - name: Bluray
   negate: false
   required: false
   source: bluray
   type: source
 - name: WEBRip
-  type: source
-  required: false
   negate: false
+  required: false
   source: webrip
+  type: source
 - name: DON
   negate: false
   pattern: DON
@@ -31,4 +36,14 @@ conditions:
   pattern: EbP
   required: false
   type: release_group
+- name: TeamSyndicate
+  type: release_group
+  required: false
+  negate: false
+  pattern: TeamSyndicate
+- name: ZoroSenpai
+  type: release_group
+  required: false
+  negate: false
+  pattern: ZoroSenpai
 tests: []
diff --git a/custom_formats/720p Quality Tier 2.yml b/custom_formats/720p Quality Tier 2.yml
index 0f9513e..c22d8dd 100644
--- a/custom_formats/720p Quality Tier 2.yml	
+++ b/custom_formats/720p Quality Tier 2.yml	
@@ -11,6 +11,11 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
 - name: Bluray
   negate: false
   required: false
@@ -21,6 +26,11 @@ conditions:
   required: false
   source: webrip
   type: source
+- name: c0kE
+  negate: false
+  pattern: c0kE
+  required: false
+  type: release_group
 - name: CRiSC
   negate: false
   pattern: CRiSC
@@ -46,11 +56,21 @@ conditions:
   pattern: IDE
   required: false
   type: release_group
+- name: REBORN
+  negate: false
+  pattern: REBORN
+  required: false
+  type: release_group
 - name: SbR
   negate: false
   pattern: SbR
   required: false
   type: release_group
+- name: SoLaR
+  type: release_group
+  required: false
+  negate: false
+  pattern: SoLaR
 - name: TayTo
   negate: false
   pattern: TayTo
@@ -61,11 +81,6 @@ conditions:
   pattern: VietHD
   required: false
   type: release_group
-- name: ZoroSenpai
-  type: release_group
-  required: false
-  negate: false
-  pattern: ZoroSenpai
 - name: ZQ
   negate: false
   pattern: ZQ
diff --git a/custom_formats/720p Quality Tier 3.yml b/custom_formats/720p Quality Tier 3.yml
index c5a5bc6..cc59b62 100644
--- a/custom_formats/720p Quality Tier 3.yml	
+++ b/custom_formats/720p Quality Tier 3.yml	
@@ -11,16 +11,21 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 - name: Bluray
   negate: false
   required: false
   source: bluray
   type: source
 - name: WEBRip
-  type: source
-  required: false
   negate: false
+  required: false
   source: webrip
+  type: source
 - name: BMF
   negate: false
   pattern: BMF
@@ -46,6 +51,11 @@ conditions:
   pattern: Positive
   required: false
   type: release_group
+- name: rightSIZE
+  negate: false
+  pattern: rightSIZE
+  required: false
+  type: release_group
 - name: TBB
   negate: false
   pattern: TBB
diff --git a/custom_formats/720p Quality Tier 4.yml b/custom_formats/720p Quality Tier 4.yml
index 997bef6..9caed20 100644
--- a/custom_formats/720p Quality Tier 4.yml	
+++ b/custom_formats/720p Quality Tier 4.yml	
@@ -11,21 +11,31 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
 - name: Bluray
   negate: false
   required: false
   source: bluray
   type: source
 - name: WEBRip
-  type: source
-  required: false
   negate: false
+  required: false
   source: webrip
+  type: source
 - name: Dariush
   negate: false
   pattern: Dariush
   required: false
   type: release_group
+- name: decibeL
+  negate: false
+  pattern: decibeL
+  required: false
+  type: release_group
 - name: D-ZON3
   negate: false
   pattern: D-Z0N3
@@ -51,9 +61,19 @@ conditions:
   pattern: PTer
   required: false
   type: release_group
+- name: Skazhutin
+  negate: false
+  pattern: Skazhutin
+  required: false
+  type: release_group
 - name: TDD
   negate: false
   pattern: TDD
   required: false
   type: release_group
+- name: ThD
+  type: release_group
+  required: false
+  negate: false
+  pattern: ThD
 tests: []
diff --git a/custom_formats/720p Quality Tier 5.yml b/custom_formats/720p Quality Tier 5.yml
index 513ad06..eb99d93 100644
--- a/custom_formats/720p Quality Tier 5.yml	
+++ b/custom_formats/720p Quality Tier 5.yml	
@@ -11,21 +11,46 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
 - name: Bluray
   negate: false
   required: false
   source: bluray
   type: source
 - name: WEBRip
-  type: source
-  required: false
   negate: false
+  required: false
   source: webrip
+  type: source
+- name: ATELiER
+  negate: false
+  pattern: ATELiER
+  required: false
+  type: release_group
+- name: BV
+  negate: false
+  pattern: BV
+  required: false
+  type: release_group
 - name: Chotab
   negate: false
   pattern: Chotab
   required: false
   type: release_group
+- name: de[42]
+  negate: false
+  pattern: de[42]
+  required: false
+  type: release_group
+- name: EA
+  type: release_group
+  required: false
+  negate: false
+  pattern: EA
 - name: EDPH
   negate: false
   pattern: EDPH
@@ -41,11 +66,26 @@ conditions:
   pattern: ESiR
   required: false
   type: release_group
+- name: FraMeSToR
+  negate: false
+  pattern: FraMeSToR
+  required: false
+  type: release_group
+- name: GS88
+  negate: false
+  pattern: GS88
+  required: false
+  type: release_group
 - name: HDMaNiAcS
   negate: false
   pattern: HDMaNiAcS
   required: false
   type: release_group
+- name: HiP
+  negate: false
+  pattern: HiP
+  required: false
+  type: release_group
 - name: iFT
   negate: false
   pattern: iFT
@@ -56,9 +96,14 @@ conditions:
   pattern: KASHMiR
   required: false
   type: release_group
-- name: MTeam
+- name: LiNG
   negate: false
-  pattern: MTeam
+  pattern: LiNG
+  required: false
+  type: release_group
+- name: LoRD
+  negate: false
+  pattern: LoRD
   required: false
   type: release_group
 - name: nmd
@@ -81,9 +126,19 @@ conditions:
   pattern: playHD
   required: false
   type: release_group
-- name: SA89
+- name: RiCO
   negate: false
-  pattern: SA89
+  pattern: RiCO
+  required: false
+  type: release_group
+- name: RO
+  negate: false
+  pattern: RO
+  required: false
+  type: release_group
+- name: rttr
+  negate: false
+  pattern: rttr
   required: false
   type: release_group
 - name: SaNcTi
@@ -91,4 +146,34 @@ conditions:
   pattern: SaNcTi
   required: false
   type: release_group
+- name: SPHD
+  negate: false
+  pattern: SPHD
+  required: false
+  type: release_group
+- name: TnP
+  negate: false
+  pattern: TnP
+  required: false
+  type: release_group
+- name: W4NK3R
+  negate: false
+  pattern: W4NK3R
+  required: false
+  type: release_group
+- name: WiLF
+  negate: false
+  pattern: WiLF
+  required: false
+  type: release_group
+- name: WMING
+  negate: false
+  pattern: WMING
+  required: false
+  type: release_group
+- name: ZIMBO
+  negate: false
+  pattern: ZIMBO
+  required: false
+  type: release_group
 tests: []
diff --git a/custom_formats/2160p Quality Tier 7.yml b/custom_formats/720p Quality Tier 6.yml
similarity index 58%
rename from custom_formats/2160p Quality Tier 7.yml
rename to custom_formats/720p Quality Tier 6.yml
index 90d8eb5..2304f67 100644
--- a/custom_formats/2160p Quality Tier 7.yml	
+++ b/custom_formats/720p Quality Tier 6.yml	
@@ -1,83 +1,89 @@
-name: 2160p Quality Tier 7
-description: Matches release groups who fall under 2160p Quality Tier 6
+name: 720p Quality Tier 6
+description: Matches release groups who fall under 720p Quality Tier 6
 tags:
+- GPPi
 - Release Group Tier
-- 2160p
+- 720p
 - Quality
 conditions:
-- name: 2160p
+- name: 720p
   negate: false
   required: true
-  resolution: 2160p
+  resolution: 720p
   type: resolution
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
 - name: Bluray
   negate: false
-  required: true
+  required: false
   source: bluray
   type: source
-- name: BeiTai
+- name: WEBRip
   negate: false
-  pattern: BeiTai
+  required: false
+  source: webrip
+  type: source
+- name: EuReKA
+  negate: false
+  pattern: EuReKA
   required: false
   type: release_group
-- name: BLUEBIRD
+- name: HANDJOB
   negate: false
-  pattern: BLUEBIRD
+  pattern: HANDJOB
   required: false
   type: release_group
-- name: BOREDOR
+- name: Ivandro
   negate: false
-  pattern: BOREDOR
+  pattern: Ivandro
   required: false
   type: release_group
-- name: CHAOS
+- name: KnG
   negate: false
-  pattern: CHAOS
+  pattern: KnG
   required: false
   type: release_group
-- name: dkore
+- name: LEGi0N
   negate: false
-  pattern: dkore
+  pattern: LEGi0N
   required: false
   type: release_group
-- name: FLAME
+- name: Lulz
   negate: false
-  pattern: FLAME
+  pattern: Lulz
   required: false
   type: release_group
-- name: Hares
+- name: MaG
   negate: false
-  pattern: Hares
+  pattern: MaG
   required: false
   type: release_group
-- name: LittleBakas
+- name: MTeam
   negate: false
-  pattern: LittleBakas
+  pattern: MTeam
   required: false
   type: release_group
-- name: Lucifer
+- name: NiP
   negate: false
-  pattern: Lucifer
+  pattern: NiP
   required: false
   type: release_group
-- name: micius
+- name: PTP
   negate: false
-  pattern: micius
+  pattern: PTP
   required: false
   type: release_group
-- name: PTH
+- name: Slappy
   negate: false
-  pattern: PTH
+  pattern: Slappy
   required: false
   type: release_group
-- name: THREESOME
+- name: WiKi
   negate: false
-  pattern: THREESOME
-  required: false
-  type: release_group
-- name: UHDCLUBREMUX
-  negate: false
-  pattern: UHDCLUBREMUX
+  pattern: WiKi
   required: false
   type: release_group
 tests: []
diff --git a/custom_formats/Anime Bluray Tier 1.yml b/custom_formats/Anime Bluray Tier 1.yml
new file mode 100644
index 0000000..a3bd767
--- /dev/null
+++ b/custom_formats/Anime Bluray Tier 1.yml	
@@ -0,0 +1,51 @@
+name: Anime Bluray Tier 1
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: LYS1TH3A
+  negate: false
+  pattern: LYS1TH3A
+  required: false
+  type: release_group
+- name: MTBB
+  negate: false
+  pattern: MTBB
+  required: false
+  type: release_group
+- name: OZR
+  negate: false
+  pattern: OZR
+  required: false
+  type: release_group
+- name: sam
+  negate: false
+  pattern: sam
+  required: false
+  type: release_group
+- name: SCY
+  negate: false
+  pattern: SCY
+  required: false
+  type: release_group
+- name: smol
+  negate: false
+  pattern: smol
+  required: false
+  type: release_group
+- name: Vodes
+  negate: false
+  pattern: Vodes
+  required: false
+  type: release_group
+tests: []
diff --git a/custom_formats/Anime Bluray Tier 2.yml b/custom_formats/Anime Bluray Tier 2.yml
new file mode 100644
index 0000000..9d28d44
--- /dev/null
+++ b/custom_formats/Anime Bluray Tier 2.yml	
@@ -0,0 +1,61 @@
+name: Anime Bluray Tier 2
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: Arid
+  negate: false
+  pattern: Arid
+  required: false
+  type: release_group
+- name: Drag
+  negate: false
+  pattern: Drag
+  required: false
+  type: release_group
+- name: hydes
+  negate: false
+  pattern: hydes
+  required: false
+  type: release_group
+- name: Lulu
+  negate: false
+  pattern: Lulu
+  required: false
+  type: release_group
+- name: Okay-Subs
+  negate: false
+  pattern: Okay-Subs
+  required: false
+  type: release_group
+- name: pog42
+  negate: false
+  pattern: pog42
+  required: false
+  type: release_group
+- name: UDF
+  negate: false
+  pattern: UDF
+  required: false
+  type: release_group
+- name: YURI
+  negate: false
+  pattern: YURI
+  required: false
+  type: release_group
+- name: ZR
+  negate: false
+  pattern: ZR
+  required: false
+  type: release_group
+tests: []
diff --git a/custom_formats/Anime Bluray Tier 3.yml b/custom_formats/Anime Bluray Tier 3.yml
new file mode 100644
index 0000000..11c910c
--- /dev/null
+++ b/custom_formats/Anime Bluray Tier 3.yml	
@@ -0,0 +1,106 @@
+name: Anime Bluray Tier 3
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: CBT
+  negate: false
+  pattern: CBT
+  required: false
+  type: release_group
+- name: CTR
+  negate: false
+  pattern: CTR
+  required: false
+  type: release_group
+- name: Dekinai
+  negate: false
+  pattern: Dekinai
+  required: false
+  type: release_group
+- name: EXP
+  negate: false
+  pattern: EXP
+  required: false
+  type: release_group
+- name: Flugel
+  negate: false
+  pattern: Flugel
+  required: false
+  type: release_group
+- name: Headpatter
+  negate: false
+  pattern: Headpatter
+  required: false
+  type: release_group
+- name: Holomux
+  negate: false
+  pattern: Holomux
+  required: false
+  type: release_group
+- name: IK
+  negate: false
+  pattern: IK
+  required: false
+  type: release_group
+- name: Kametsu
+  negate: false
+  pattern: Kametsu
+  required: false
+  type: release_group
+- name: KH
+  negate: false
+  pattern: KH
+  required: false
+  type: release_group
+- name: kuchikirukia
+  negate: false
+  pattern: kuchikirukia
+  required: false
+  type: release_group
+- name: Mysteria
+  negate: false
+  pattern: Mysteria
+  required: false
+  type: release_group
+- name: Netaro
+  negate: false
+  pattern: Netaro
+  required: false
+  type: release_group
+- name: Pookie
+  negate: false
+  pattern: Pookie
+  required: false
+  type: release_group
+- name: Quetzal
+  negate: false
+  pattern: Quetzal
+  required: false
+  type: release_group
+- name: Rasetsu
+  negate: false
+  pattern: Rasetsu
+  required: false
+  type: release_group
+- name: Senjou
+  negate: false
+  pattern: Senjou
+  required: false
+  type: release_group
+- name: WBDP
+  negate: false
+  pattern: WBDP
+  required: false
+  type: release_group
+tests: []
diff --git a/custom_formats/Anime Bluray Tier 4.yml b/custom_formats/Anime Bluray Tier 4.yml
new file mode 100644
index 0000000..392b637
--- /dev/null
+++ b/custom_formats/Anime Bluray Tier 4.yml	
@@ -0,0 +1,116 @@
+name: Anime Bluray Tier 4
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: 9volt
+  negate: false
+  pattern: 9volt
+  required: false
+  type: release_group
+- name: AOmundson
+  negate: false
+  pattern: AOmundson
+  required: false
+  type: release_group
+- name: Asakura
+  negate: false
+  pattern: Asakura
+  required: false
+  type: release_group
+- name: Cait-Sidhe
+  negate: false
+  pattern: Cait-Sidhe
+  required: false
+  type: release_group
+- name: Chihiro
+  negate: false
+  pattern: Chihiro
+  required: false
+  type: release_group
+- name: CoalGirls
+  negate: false
+  pattern: CoalGirls
+  required: false
+  type: release_group
+- name: Commie
+  negate: false
+  pattern: Commie
+  required: false
+  type: release_group
+- name: deanzel
+  negate: false
+  pattern: deanzel
+  required: false
+  type: release_group
+- name: Doki
+  negate: false
+  pattern: Doki
+  required: false
+  type: release_group
+- name: hchcsen
+  negate: false
+  pattern: hchcsen
+  required: false
+  type: release_group
+- name: Iznjie Biznjie
+  negate: false
+  pattern: Iznjie Biznjie
+  required: false
+  type: release_group
+- name: Kaleido
+  negate: false
+  pattern: Kaleido
+  required: false
+  type: release_group
+- name: kBaraka
+  negate: false
+  pattern: kBaraka
+  required: false
+  type: release_group
+- name: kmplx
+  negate: false
+  pattern: kmplx
+  required: false
+  type: release_group
+- name: Koten_Gars
+  negate: false
+  pattern: Koten_Gars
+  required: false
+  type: release_group
+- name: mottoj
+  negate: false
+  pattern: mottoj
+  required: false
+  type: release_group
+- name: Orphan
+  negate: false
+  pattern: Orphan
+  required: false
+  type: release_group
+- name: SallySubs
+  negate: false
+  pattern: SallySubs
+  required: false
+  type: release_group
+- name: THORA
+  negate: false
+  pattern: THORA
+  required: false
+  type: release_group
+- name: Tsundere
+  negate: false
+  pattern: Tsundere
+  required: false
+  type: release_group
+tests: []
diff --git a/custom_formats/Anime Bluray Tier 5.yml b/custom_formats/Anime Bluray Tier 5.yml
new file mode 100644
index 0000000..3b7978f
--- /dev/null
+++ b/custom_formats/Anime Bluray Tier 5.yml	
@@ -0,0 +1,56 @@
+name: Anime Bluray Tier 5
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Not Remux
+  negate: true
+  pattern: Remux
+  required: true
+  type: release_title
+- name: Almighty
+  negate: false
+  pattern: Almighty
+  required: false
+  type: release_group
+- name: ANE
+  negate: false
+  pattern: ANE
+  required: false
+  type: release_group
+- name: BlurayDesuYo
+  negate: false
+  pattern: BlurayDesuYo
+  required: false
+  type: release_group
+- name: FFF
+  negate: false
+  pattern: FFF
+  required: false
+  type: release_group
+- name: Final8
+  negate: false
+  pattern: Final8
+  required: false
+  type: release_group
+- name: Raizel
+  negate: false
+  pattern: Raizel
+  required: false
+  type: release_group
+- name: Saizen
+  negate: false
+  pattern: Saizen
+  required: false
+  type: release_group
+- name: Zurako
+  negate: false
+  pattern: Zurako
+  required: false
+  type: release_group
+tests: []
diff --git a/custom_formats/Anime WEB-DL Tier 1.yml b/custom_formats/Anime WEB-DL Tier 1.yml
new file mode 100644
index 0000000..0454ea9
--- /dev/null
+++ b/custom_formats/Anime WEB-DL Tier 1.yml	
@@ -0,0 +1,21 @@
+name: Anime WEB-DL Tier 1
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: WEB-DL
+  negate: false
+  required: false
+  source: web_dl
+  type: source
+- name: WEB
+  negate: false
+  required: false
+  source: television
+  type: source
+- name: Subsplease
+  negate: false
+  pattern: SubsPlease
+  required: false
+  type: release_title
+tests: []
diff --git a/custom_formats/Anime WEB-DL Tier 2.yml b/custom_formats/Anime WEB-DL Tier 2.yml
new file mode 100644
index 0000000..68b4084
--- /dev/null
+++ b/custom_formats/Anime WEB-DL Tier 2.yml	
@@ -0,0 +1,36 @@
+name: Anime WEB-DL Tier 2
+description: Do not use Testing Purposes Only
+tags:
+- Anime
+conditions:
+- name: WEB-DL
+  negate: false
+  required: false
+  source: web_dl
+  type: source
+- name: WEB
+  negate: false
+  required: false
+  source: television
+  type: source
+- name: Erai-Raws
+  negate: false
+  pattern: Erai-Raws
+  required: false
+  type: release_title
+- name: HorribleSubs
+  negate: false
+  pattern: HorribleSubs
+  required: false
+  type: release_title
+- name: Subsplus+
+  negate: false
+  pattern: SubsPlus+
+  required: false
+  type: release_title
+- name: VARYG
+  negate: false
+  pattern: VARYG
+  required: false
+  type: release_title
+tests: []
diff --git a/custom_formats/Banned Groups (Efficient).yml b/custom_formats/Banned Groups (Efficient).yml
index 787457a..402d81a 100644
--- a/custom_formats/Banned Groups (Efficient).yml	
+++ b/custom_formats/Banned Groups (Efficient).yml	
@@ -174,6 +174,11 @@ conditions:
   pattern: TvR
   required: false
   type: release_group
+- name: VD0N
+  type: release_group
+  required: false
+  negate: false
+  pattern: VD0N
 - name: VECTOR
   negate: false
   pattern: VECTOR
diff --git a/custom_formats/Banned Groups.yml b/custom_formats/Banned Groups.yml
index e629187..af84c4d 100644
--- a/custom_formats/Banned Groups.yml	
+++ b/custom_formats/Banned Groups.yml	
@@ -194,6 +194,11 @@ conditions:
   pattern: TvR
   required: false
   type: release_group
+- name: VD0N
+  negate: false
+  pattern: VD0N
+  required: false
+  type: release_group
 - name: VECTOR
   negate: false
   pattern: VECTOR
diff --git a/custom_formats/CRAV.yml b/custom_formats/CRAV.yml
new file mode 100644
index 0000000..ee9eddc
--- /dev/null
+++ b/custom_formats/CRAV.yml
@@ -0,0 +1,59 @@
+name: CRAV
+description: Matches 'Crave' WEB-DLs. Negates any encodes.
+tags:
+- Streaming Service
+- WEB-DL
+conditions:
+- name: CRAV Regex
+  negate: false
+  pattern: Crave
+  required: true
+  type: release_title
+- name: WEB-DL
+  negate: false
+  required: false
+  source: web_dl
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
+tests:
+- conditionResults:
+  - matches: true
+    name: AMZN Regex
+    negate: false
+    pattern: Amazon Prime
+    required: true
+    type: release_title
+  - matches: true
+    name: x265
+    negate: true
+    pattern: x265
+    required: false
+    type: release_title
+  expected: false
+  id: 1
+  input: The Bad Guys (2022) (1080p AMZN Webrip x265 10bit EAC3 5 1 - ArcX)[TAoE]
+  lastRun: '2025-01-14T09:45:16.007149'
+  passes: true
+- conditionResults:
+  - matches: true
+    name: AMZN Regex
+    negate: false
+    pattern: Amazon Prime
+    required: true
+    type: release_title
+  - matches: true
+    name: x265
+    negate: true
+    pattern: x265
+    required: false
+    type: release_title
+  expected: false
+  id: 2
+  input: Top Gun Maverick (2022) IMAX (1080p AMZN WEB-DL x265 SDR DDP Atmos 5.1 English
+    - Goki TAoE)
+  lastRun: '2025-01-14T09:45:16.007149'
+  passes: true
diff --git a/custom_formats/Foreign Release Groups.yml b/custom_formats/Foreign Release Groups.yml
new file mode 100644
index 0000000..5e9f45f
--- /dev/null
+++ b/custom_formats/Foreign Release Groups.yml	
@@ -0,0 +1,11 @@
+name: Foreign Release Groups
+description: Matches releases labeled Nordic for now
+tags:
+- Enhancement
+conditions:
+- name: Nordic
+  negate: false
+  pattern: Nordic
+  required: true
+  type: release_title
+tests: []
diff --git a/custom_formats/HMAX.yml b/custom_formats/HMAX.yml
index db3b1a4..21c6bdb 100644
--- a/custom_formats/HMAX.yml
+++ b/custom_formats/HMAX.yml
@@ -7,12 +7,7 @@ conditions:
 - name: HMAX Regex
   negate: false
   pattern: HBO Max
-  required: false
-  type: release_title
-- name: HMAX Rename Regex
-  negate: false
-  pattern: HBO Max Rename
-  required: false
+  required: true
   type: release_title
 - name: WEB-DL
   negate: false
diff --git a/custom_formats/Remux Tier 2.yml b/custom_formats/Remux Tier 2.yml
index 6e530af..2f85577 100644
--- a/custom_formats/Remux Tier 2.yml	
+++ b/custom_formats/Remux Tier 2.yml	
@@ -29,6 +29,11 @@ conditions:
   pattern: LM
   required: false
   type: release_group
+- name: PiRAMiDHEAD
+  type: release_group
+  required: false
+  negate: false
+  pattern: PiRAMiDHEAD
 - name: PmP
   negate: false
   pattern: PmP
diff --git a/custom_formats/Remux Tier 3.yml b/custom_formats/Remux Tier 3.yml
index 6bb274b..15e5af1 100644
--- a/custom_formats/Remux Tier 3.yml	
+++ b/custom_formats/Remux Tier 3.yml	
@@ -14,6 +14,11 @@ conditions:
   required: true
   source: dvd
   type: source
+- name: ATELiER
+  negate: false
+  pattern: ATELiER
+  required: false
+  type: release_group
 - name: decibeL
   negate: false
   pattern: decibeL
@@ -44,4 +49,9 @@ conditions:
   pattern: TEPES
   required: false
   type: release_group
+- name: ZoroSenpai
+  type: release_group
+  required: false
+  negate: false
+  pattern: ZoroSenpai
 tests: []
diff --git a/custom_formats/Remux Tier 4.yml b/custom_formats/Remux Tier 4.yml
index bb0fda1..1977dbc 100644
--- a/custom_formats/Remux Tier 4.yml	
+++ b/custom_formats/Remux Tier 4.yml	
@@ -14,6 +14,11 @@ conditions:
   required: true
   source: dvd
   type: source
+- name: '126811'
+  negate: false
+  pattern: '126811'
+  required: false
+  type: release_group
 - name: BTN
   negate: false
   pattern: BTN
@@ -44,9 +49,4 @@ conditions:
   pattern: TRiToN
   required: false
   type: release_group
-- name: ZoroSenpai
-  negate: false
-  pattern: ZoroSenpai
-  required: false
-  type: release_group
 tests: []
diff --git a/custom_formats/Vialle Bluray.yml b/custom_formats/Vialle Bluray.yml
new file mode 100644
index 0000000..851fc1f
--- /dev/null
+++ b/custom_formats/Vialle Bluray.yml	
@@ -0,0 +1,25 @@
+name: Vialle Bluray
+description: ''
+tags: []
+conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: Vialle
+  negate: false
+  pattern: Vialle
+  required: true
+  type: release_title
+- name: Release Group
+  negate: true
+  pattern: Vialle
+  required: true
+  type: release_group
+tests: []
diff --git a/custom_formats/Vialle WEB.yml b/custom_formats/Vialle WEB.yml
new file mode 100644
index 0000000..5c3c41e
--- /dev/null
+++ b/custom_formats/Vialle WEB.yml	
@@ -0,0 +1,30 @@
+name: Vialle WEB
+description: ''
+tags: []
+conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Vialle
+  negate: false
+  pattern: Vialle
+  required: true
+  type: release_title
+- name: Release Group
+  negate: true
+  pattern: Vialle
+  required: true
+  type: release_group
+- name: WEB-DL
+  negate: false
+  required: false
+  source: web_dl
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
+tests: []
diff --git a/custom_formats/WEB-DL Tier 3.yml b/custom_formats/WEB-DL Tier 3.yml
index 69e364e..2efc3b0 100644
--- a/custom_formats/WEB-DL Tier 3.yml	
+++ b/custom_formats/WEB-DL Tier 3.yml	
@@ -114,11 +114,16 @@ conditions:
   pattern: SMURF
   required: false
   type: release_group
-- name: TheFarm
+- name: TeamSyndicate
   type: release_group
   required: false
+  negate: false
+  pattern: TeamSyndicate
+- name: TheFarm
   negate: false
   pattern: TheFarm
+  required: false
+  type: release_group
 - name: TOMMY
   negate: false
   pattern: TOMMY
diff --git a/custom_formats/WEB-DL Tier 4.yml b/custom_formats/WEB-DL Tier 4.yml
index 9dca82b..c8c8388 100644
--- a/custom_formats/WEB-DL Tier 4.yml	
+++ b/custom_formats/WEB-DL Tier 4.yml	
@@ -9,6 +9,11 @@ conditions:
   required: true
   source: web_dl
   type: source
+- name: '126811'
+  type: release_group
+  required: false
+  negate: false
+  pattern: '126811'
 - name: APEX
   negate: false
   pattern: APEX
@@ -25,10 +30,10 @@ conditions:
   required: false
   type: release_group
 - name: PTP
-  type: release_group
-  required: false
   negate: false
   pattern: PTP
+  required: false
+  type: release_group
 - name: RTN
   negate: false
   pattern: RTN
diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml
index fe78714..c4c7a9f 100644
--- a/profiles/1080p Quality.yml	
+++ b/profiles/1080p Quality.yml	
@@ -23,14 +23,16 @@ custom_formats:
 - name: 720p Bluray
   score: 100000
 - name: 1080p Quality Tier 1
-  score: 84000
+  score: 85000
 - name: 1080p Quality Tier 2
-  score: 83000
+  score: 84000
 - name: 1080p Quality Tier 3
-  score: 82000
+  score: 83000
 - name: 1080p Quality Tier 4
-  score: 81000
+  score: 82000
 - name: 1080p Quality Tier 5
+  score: 81000
+- name: 1080p Quality Tier 6
   score: 80000
 - name: 720p WEB-DL
   score: 80000
@@ -39,14 +41,16 @@ custom_formats:
 - name: 480p WEB-DL
   score: 60000
 - name: 720p Quality Tier 1
-  score: 44000
+  score: 45000
 - name: 720p Quality Tier 2
-  score: 43000
+  score: 44000
 - name: 720p Quality Tier 3
-  score: 42000
+  score: 43000
 - name: 720p Quality Tier 4
-  score: 41000
+  score: 42000
 - name: 720p Quality Tier 5
+  score: 41000
+- name: 720p Quality Tier 6
   score: 40000
 - name: 720p Balanced Tier 1
   score: 20000
@@ -116,6 +120,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -128,10 +134,10 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
 - name: AV1
   score: -999999
-- name: B&W
-  score: -999999
 - name: Banned Groups
   score: -999999
 - name: Banned Groups (Title)
@@ -155,15 +161,9 @@ custom_formats:
 - name: VVC
   score: -999999
 custom_formats_radarr:
-- name: 1080p Golden Popcorn
-  score: 8000
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
-  score: 5000
-- name: SD Golden Popcorn
   score: 4000
-- name: ATV
+- name: Better Theatricals
   score: 1000
 - name: CRIT
   score: 1000
@@ -171,6 +171,8 @@ custom_formats_radarr:
   score: 1000
 - name: 3D
   score: -999999
+- name: B&W
+  score: -999999
 - name: Extras
   score: -999999
 - name: Full Disc (Quality Match)
diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml
index b8bf560..a7c7cf7 100644
--- a/profiles/2160p Balanced.yml	
+++ b/profiles/2160p Balanced.yml	
@@ -13,6 +13,20 @@ custom_formats:
   score: 140000
 - name: 1080p WEBRip
   score: 140000
+- name: 720p WEB-DL
+  score: 100000
+- name: 1080p Quality Tier 1
+  score: 85000
+- name: 1080p Quality Tier 2
+  score: 84000
+- name: 1080p Quality Tier 3
+  score: 83000
+- name: 1080p Quality Tier 4
+  score: 82000
+- name: 1080p Quality Tier 5
+  score: 81000
+- name: 1080p Quality Tier 6
+  score: 80000
 - name: 720p Bluray
   score: 100000
 - name: 720p WEB-DL
@@ -23,6 +37,18 @@ custom_formats:
   score: 60000
 - name: 480p WEB-DL
   score: 60000
+- name: 720p Quality Tier 1
+  score: 45000
+- name: 720p Quality Tier 2
+  score: 44000
+- name: 720p Quality Tier 3
+  score: 43000
+- name: 720p Quality Tier 4
+  score: 42000
+- name: 720p Quality Tier 5
+  score: 41000
+- name: 720p Quality Tier 6
+  score: 40000
 - name: 2160p Balanced Tier 1
   score: 33000
 - name: 2160p Balanced Tier 2
@@ -133,6 +159,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -145,10 +173,12 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
-- name: B&W
-  score: -999999
 - name: Banned Groups
   score: -999999
 - name: Banned Groups (Title)
@@ -172,16 +202,18 @@ custom_formats:
 - name: x264 (2160p)
   score: -999999
 custom_formats_radarr:
-- name: 1080p Golden Popcorn
-  score: 8000
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
-  score: 5000
-- name: SD Golden Popcorn
+  score: 6000
+- name: ATVP
+  score: 4000
+- name: DSNP
   score: 4000
 - name: iT
-  score: 3000
+  score: 4000
+- name: Amazon Enhancement
+  score: 2000
+- name: HMAX
+  score: 2000
 - name: MAX
   score: 2000
 - name: CRIT
@@ -190,6 +222,8 @@ custom_formats_radarr:
   score: 1000
 - name: 3D
   score: -999999
+- name: B&W
+  score: -999999
 - name: Extras
   score: -999999
 - name: Full Disc (Quality Match)
diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml
index 53aed34..95488ae 100644
--- a/profiles/2160p Quality.yml	
+++ b/profiles/2160p Quality.yml	
@@ -7,6 +7,22 @@ custom_formats:
   score: 250000
 - name: 2160p WEB-DL
   score: 240000
+- name: 2160p Quality Tier 1
+  score: 284000
+- name: 2160p Quality Tier 2
+  score: 283000
+- name: 2160p Quality Tier 3
+  score: 282000
+- name: 2160p Quality Tier 4
+  score: 281000
+- name: 2160p Quality Tier 5
+  score: 280000
+- name: 2160p Balanced Tier 1
+  score: 264000
+- name: 2160p Balanced Tier 2
+  score: 260000
+- name: 2160p Quality Tier 6
+  score: 259000
 - name: 1080p Bluray
   score: 200000
 - name: 1080p WEB-DL
@@ -16,14 +32,16 @@ custom_formats:
 - name: 720p Bluray
   score: 100000
 - name: 1080p Quality Tier 1
-  score: 84000
+  score: 85000
 - name: 1080p Quality Tier 2
-  score: 83000
+  score: 84000
 - name: 1080p Quality Tier 3
-  score: 82000
+  score: 83000
 - name: 1080p Quality Tier 4
-  score: 81000
+  score: 82000
 - name: 1080p Quality Tier 5
+  score: 81000
+- name: 1080p Quality Tier 6
   score: 80000
 - name: 720p WEB-DL
   score: 80000
@@ -42,14 +60,16 @@ custom_formats:
 - name: 2160p Quality Tier 5
   score: 50000
 - name: 720p Quality Tier 1
-  score: 44000
+  score: 45000
 - name: 720p Quality Tier 2
-  score: 43000
+  score: 44000
 - name: 720p Quality Tier 3
-  score: 42000
+  score: 43000
 - name: 720p Quality Tier 4
-  score: 41000
+  score: 42000
 - name: 720p Quality Tier 5
+  score: 41000
+- name: 720p Quality Tier 6
   score: 40000
 - name: 720p Balanced Tier 1
   score: 20000
@@ -139,6 +159,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -151,10 +173,12 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
-- name: B&W
-  score: -999999
 - name: Banned Groups
   score: -999999
 - name: Banned Groups (Title)
@@ -178,16 +202,18 @@ custom_formats:
 - name: x264 (2160p)
   score: -999999
 custom_formats_radarr:
-- name: 1080p Golden Popcorn
-  score: 8000
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
-  score: 5000
-- name: SD Golden Popcorn
+  score: 6000
+- name: ATVP
+  score: 4000
+- name: DSNP
   score: 4000
 - name: iT
-  score: 3000
+  score: 4000
+- name: Amazon Enhancement
+  score: 2000
+- name: HMAX
+  score: 2000
 - name: MAX
   score: 2000
 - name: CRIT
@@ -196,6 +222,8 @@ custom_formats_radarr:
   score: 1000
 - name: 3D
   score: -999999
+- name: B&W
+  score: -999999
 - name: Extras
   score: -999999
 - name: Full Disc (Quality Match)
diff --git a/profiles/2160p Remux (Prefer Theatrical).yml b/profiles/2160p Remux (Prefer Theatrical).yml
index 571ed78..fbf9864 100644
--- a/profiles/2160p Remux (Prefer Theatrical).yml	
+++ b/profiles/2160p Remux (Prefer Theatrical).yml	
@@ -19,14 +19,40 @@ custom_formats:
   score: 120000
 - name: 1080p WEB-DL
   score: 100000
+- name: 1080p Quality Tier 1
+  score: 85000
+- name: 1080p Quality Tier 2
+  score: 84000
+- name: 1080p Quality Tier 3
+  score: 83000
+- name: 1080p Quality Tier 4
+  score: 82000
+- name: 1080p Quality Tier 5
+  score: 81000
 - name: 1080p WEBRip
   score: 85000
 - name: 720p WEB-DL
+  score: 81000
+- name: 1080p Quality Tier 6
   score: 80000
 - name: 480p WEB-DL
   score: 60000
+- name: 720p Quality Tier 1
+  score: 45000
+- name: 720p Quality Tier 2
+  score: 44000
+- name: 720p Quality Tier 3
+  score: 43000
+- name: 720p Quality Tier 4
+  score: 42000
+- name: 720p Quality Tier 5
+  score: 41000
+- name: 720p Quality Tier 6
+  score: 40000
 - name: 720p WEBRip
   score: 50000
+- name: 720p Balanced Tier 1
+  score: 20000
 - name: DVD
   score: 20000
 - name: SD Quality Tier 1
@@ -121,6 +147,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -133,10 +161,12 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
-- name: B&W
-  score: -999999
 - name: Banned Groups
   score: -999999
 - name: Banned Groups (Title)
diff --git a/profiles/2160p Remux Only.yml b/profiles/2160p Remux Only.yml
index 3d6b900..f8c9eaa 100644
--- a/profiles/2160p Remux Only.yml	
+++ b/profiles/2160p Remux Only.yml	
@@ -20,12 +20,48 @@ custom_formats:
   score: 120000
 - name: 1080p WEB-DL
   score: 100000
+- name: 2160p Quality Tier 1
+  score: 304000
+- name: 2160p Quality Tier 2
+  score: 303000
+- name: 2160p Quality Tier 3
+  score: 302000
+- name: 2160p Quality Tier 4
+  score: 301000
+- name: 2160p Quality Tier 5
+  score: 300000
+- name: 2160p Quality Tier 6
+  score: 279000
+- name: 1080p Quality Tier 1
+  score: 85000
+- name: 1080p Quality Tier 2
+  score: 84000
+- name: 1080p Quality Tier 3
+  score: 83000
+- name: 1080p Quality Tier 4
+  score: 82000
+- name: 1080p Quality Tier 5
+  score: 81000
+- name: 1080p Quality Tier 6
+  score: 80000
 - name: 1080p WEBRip
   score: 85000
 - name: 720p WEB-DL
   score: 80000
 - name: 480p WEB-DL
   score: 60000
+- name: 720p Quality Tier 1
+  score: 45000
+- name: 720p Quality Tier 2
+  score: 44000
+- name: 720p Quality Tier 3
+  score: 43000
+- name: 720p Quality Tier 4
+  score: 42000
+- name: 720p Quality Tier 5
+  score: 41000
+- name: 720p Quality Tier 6
+  score: 40000
 - name: 720p WEBRip
   score: 50000
 - name: DVD
@@ -122,6 +158,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -134,6 +172,10 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
 - name: B&W
@@ -169,8 +211,6 @@ custom_formats_radarr:
   score: 2000
 - name: CRIT
   score: 1000
-- name: Special Edition
-  score: 1000
 - name: 3D
   score: -999999
 - name: Extras
diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml
index e28a28f..14f2a4a 100644
--- a/profiles/2160p Remux.yml	
+++ b/profiles/2160p Remux.yml	
@@ -130,6 +130,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -142,6 +144,10 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
 - name: B&W
@@ -177,8 +183,6 @@ custom_formats_radarr:
   score: 2000
 - name: CRIT
   score: 1000
-- name: Special Edition
-  score: 1000
 - name: 3D
   score: -999999
 - name: Extras
diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml
index 7049418..36cbc49 100644
--- a/profiles/720p Quality.yml	
+++ b/profiles/720p Quality.yml	
@@ -23,14 +23,16 @@ custom_formats:
 - name: 480p WEB-DL
   score: 60000
 - name: 720p Quality Tier 1
-  score: 44000
+  score: 45000
 - name: 720p Quality Tier 2
-  score: 43000
+  score: 44000
 - name: 720p Quality Tier 3
-  score: 42000
+  score: 43000
 - name: 720p Quality Tier 4
-  score: 41000
+  score: 42000
 - name: 720p Quality Tier 5
+  score: 41000
+- name: 720p Quality Tier 6
   score: 40000
 - name: 720p Balanced Tier 1
   score: 20000
@@ -100,6 +102,8 @@ custom_formats:
   score: 0
 - name: BCORE
   score: 0
+- name: CRAV
+  score: 0
 - name: HTSR
   score: 0
 - name: HULU
@@ -112,10 +116,10 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: Foreign Release Groups
+  score: -900
 - name: AV1
   score: -999999
-- name: B&W
-  score: -999999
 - name: Banned Groups
   score: -999999
 - name: Banned Groups (Title)
@@ -141,18 +145,18 @@ custom_formats:
 - name: VVC
   score: -999999
 custom_formats_radarr:
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
-  score: 5000
-- name: SD Golden Popcorn
   score: 4000
+- name: Better Theatricals
+  score: 1000
 - name: CRIT
   score: 1000
 - name: Special Edition
   score: 1000
 - name: 3D
   score: -999999
+- name: B&W
+  score: -999999
 - name: Extras
   score: -999999
 - name: Full Disc (Quality Match)
diff --git a/regex_patterns/126811.yml b/regex_patterns/126811.yml
new file mode 100644
index 0000000..df4d697
--- /dev/null
+++ b/regex_patterns/126811.yml
@@ -0,0 +1,7 @@
+name: '126811'
+pattern: (?<=^|[\s.-])126811\b
+description: ''
+tags:
+- Release Group
+- WEB-DL
+tests: []
diff --git a/regex_patterns/Almighty.yml b/regex_patterns/Almighty.yml
new file mode 100644
index 0000000..86f78e1
--- /dev/null
+++ b/regex_patterns/Almighty.yml
@@ -0,0 +1,7 @@
+name: Almighty
+pattern: (?<=^|[\s.-])Almighty\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/Atmos.yml b/regex_patterns/Atmos.yml
index 50eada5..3aac28f 100644
--- a/regex_patterns/Atmos.yml
+++ b/regex_patterns/Atmos.yml
@@ -1,45 +1,19 @@
 name: Atmos
-pattern: \bATMOS(\b|\d)
+pattern: \bATMOS|DDPA(\b|\d)
 description: ''
 tags:
 - Audio
 - Enhancement
 tests:
-- expected: false
-  id: 1
+- 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
+  expected: false
+- 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
+  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
+  expected: true
+- 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
+  expected: true
diff --git a/regex_patterns/BTN Atmos.yml b/regex_patterns/BTN Atmos.yml
index ee6283f..8847ccc 100644
--- a/regex_patterns/BTN Atmos.yml	
+++ b/regex_patterns/BTN Atmos.yml	
@@ -1,52 +1,21 @@
 name: BTN Atmos
-pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1|DDPA[57]\.1\b
+pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1
 description: Matches BroadcastTheNet Atmos naming convention
 tags:
 - Audio
 tests:
-- expected: true
-  id: 1
+- 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
+  expected: true
+- 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
+  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
+  expected: false
+- 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
+  expected: false
+- 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
+  expected: true
diff --git a/regex_patterns/Crave.yml b/regex_patterns/Crave.yml
new file mode 100644
index 0000000..b142518
--- /dev/null
+++ b/regex_patterns/Crave.yml
@@ -0,0 +1,38 @@
+name: Crave
+pattern: \b(?:CRAV|(?:CRAVE)(?=\s*.(?:WEB-?DL|WEBRIP)))\b
+description: Crave (originally CraveTV) is a Canadian subscription video on demand
+  service. The service competes directly with other subscription-based over-the-top
+  streaming services operating in Canada, primarily against American-based services.
+  The service features Bell Media original programming, exclusive Canadian access
+  to programming acquired from several U.S. television and streaming services, and
+  various theatrically-released films. Crave's major programming supplier is Warner
+  Bros. Discovery (HBO / Max and Warner Bros. films). Starz, offered in partnership
+  with Lionsgate.
+tags:
+- Streaming Service
+- WEB-DL
+tests:
+- id: 1
+  input: The CRAVE Accountant 2 2025 2160p CRAV WEB-DL DD+ 5.1 Atmos DV H.265-FLUX
+  expected: true
+- id: 2
+  input: The CRAVE Accountant 2 2025 2160p CRAV WEBRIP DD+ 5.1 Atmos DV H.265-FLUX
+  expected: true
+- id: 3
+  input: The.CRAVE.Accountant.2.2025.2160p.CRAVE.WEBDL.DD+.5.1.Atmos.DV.H.265-FLUX
+  expected: true
+- id: 4
+  input: 'Star Trek: Picard CRAVE S03 2160p CRAV WEB-DL DTS-HD MA 5.1 H.265-FLUX'
+  expected: true
+- id: 5
+  input: 'Star Trek: Picard CRAVE S03 2160p CRAVE WEBRIP DTS-HD MA 5.1 H.265-FLUX'
+  expected: true
+- id: 6
+  input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAV.WEB-DL.DDP5.1.HDR.H.265-FLUX.mkv
+  expected: true
+- id: 7
+  input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAV.WEBRIP.DDP5.1.HDR.H.265-FLUX.mkv
+  expected: true
+- id: 8
+  input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAVE.WEBDL.DDP5.1.HDR.H.265-FLUX.mkv
+  expected: true
diff --git a/regex_patterns/FTW-HD.yml b/regex_patterns/EuReKA.yml
similarity index 56%
rename from regex_patterns/FTW-HD.yml
rename to regex_patterns/EuReKA.yml
index 7551328..33be3ac 100644
--- a/regex_patterns/FTW-HD.yml
+++ b/regex_patterns/EuReKA.yml
@@ -1,5 +1,5 @@
-name: FTW-HD
-pattern: (?<=^|[\s.-])FTW-HD\b
+name: EuReKA
+pattern: (?<=^|[\s.-])EuReKA\b
 description: ''
 tags:
 - Release Group
diff --git a/regex_patterns/Golden Popcorn Negation.yml b/regex_patterns/Golden Popcorn Negation.yml
new file mode 100644
index 0000000..0bf5749
--- /dev/null
+++ b/regex_patterns/Golden Popcorn Negation.yml	
@@ -0,0 +1,5 @@
+name: Golden Popcorn Negation
+pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BSTD|BV|c0kE|Chotab|CJ|coffee|CRiSC|CRX|CtrlHD|Dariush|de[42]|decibel|DON|D-Z0N3|E.N.D|E1|EDPH|EbP|ESiR|EuReKA|EXCiSION|FoRM|FraMeSToR|GALAXY|Geek|GS88|HANDJOB|hdalx|HDC|HDMaNiAcS|HiDt|HiFi|HiP|HQMUX|IDE|iFT|iON|Ivandro|KASHMiR|Kitsune|KnG|LEGi0N|LiNG|LolHD|LoRD|luvBB|MaG|MTeam|NCmt|NiBuRu|NiP|nmd|NTb|NyHD|ORiGEN|P0W4HD|Penumbra|playHD|Positive|PTer|PTP|REBORN|RiCO|rightSIZE|RO|ROCiNANTE|rttr|SA89|SaNcTi|SbR|SiMPLE|Skazhutin|Slappy|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|ThD|TnP|VLAD|VietHD|W4NK3R|WiKi|WiLDCAT|WiLF|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b
+description: Match release groups who should not be categorized as UHD Bluray
+tags: []
+tests: []
diff --git a/regex_patterns/HBO Max Rename.yml b/regex_patterns/HBO Max Rename.yml
deleted file mode 100644
index 35b0747..0000000
--- a/regex_patterns/HBO Max Rename.yml	
+++ /dev/null
@@ -1,74 +0,0 @@
-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".
-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 eb11739..1b89216 100644
--- a/regex_patterns/HBO Max.yml	
+++ b/regex_patterns/HBO Max.yml	
@@ -1,5 +1,5 @@
 name: HBO Max
-pattern: \b(hmax|hbom|hbo[ ._-]?max)\b(?=[ ._-]web[ ._-]?(dl|rip)\b)
+pattern: \b(?:HMAX|HBOM|(?:HBO[ ._-]?MAX)(?=\s*.(?:WEB-?DL|WEBRIP)))\b
 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
@@ -8,67 +8,21 @@ tags:
 - Streaming Service
 - WEB-DL
 tests:
-- expected: true
-  id: 1
+- 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
+  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
+  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
+  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
+  expected: true
+- 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
+  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
+  expected: false
diff --git a/regex_patterns/Headpatter.yml b/regex_patterns/Headpatter.yml
new file mode 100644
index 0000000..82d4d6e
--- /dev/null
+++ b/regex_patterns/Headpatter.yml
@@ -0,0 +1,7 @@
+name: Headpatter
+pattern: (?<=^|[\s.-])Headpatter\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/Holomux.yml b/regex_patterns/Holomux.yml
new file mode 100644
index 0000000..878fd85
--- /dev/null
+++ b/regex_patterns/Holomux.yml
@@ -0,0 +1,7 @@
+name: Holomux
+pattern: (?<=^|[\s.-])Holomux\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/Ivandro.yml b/regex_patterns/Ivandro.yml
new file mode 100644
index 0000000..df3bc4a
--- /dev/null
+++ b/regex_patterns/Ivandro.yml
@@ -0,0 +1,7 @@
+name: Ivandro
+pattern: (?<=^|[\s.-])Ivandro\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/FilmHD.yml b/regex_patterns/KnG.yml
similarity index 56%
rename from regex_patterns/FilmHD.yml
rename to regex_patterns/KnG.yml
index 53f9359..f788cd5 100644
--- a/regex_patterns/FilmHD.yml
+++ b/regex_patterns/KnG.yml
@@ -1,5 +1,5 @@
-name: FilmHD
-pattern: (?<=^|[\s.-])FilmHD\b
+name: KnG
+pattern: (?<=^|[\s.-])KnG\b
 description: ''
 tags:
 - Release Group
diff --git a/regex_patterns/Lulz.yml b/regex_patterns/Lulz.yml
new file mode 100644
index 0000000..60981d7
--- /dev/null
+++ b/regex_patterns/Lulz.yml
@@ -0,0 +1,7 @@
+name: Lulz
+pattern: (?<=^|[\s.-])Lulz\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/MaG.yml b/regex_patterns/MaG.yml
new file mode 100644
index 0000000..03d0b45
--- /dev/null
+++ b/regex_patterns/MaG.yml
@@ -0,0 +1,7 @@
+name: MaG
+pattern: (?<=^|[\s.-])MaG\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/NH.yml b/regex_patterns/NH.yml
new file mode 100644
index 0000000..df7cf6e
--- /dev/null
+++ b/regex_patterns/NH.yml
@@ -0,0 +1,7 @@
+name: NH
+pattern: (?<=^|[\s.-])NH\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/NiBuRu.yml b/regex_patterns/NiBuRu.yml
new file mode 100644
index 0000000..cfc2614
--- /dev/null
+++ b/regex_patterns/NiBuRu.yml
@@ -0,0 +1,7 @@
+name: NiBuRu
+pattern: (?<=^|[\s.-])NiBuRu\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/NiP.yml b/regex_patterns/NiP.yml
new file mode 100644
index 0000000..9bc5628
--- /dev/null
+++ b/regex_patterns/NiP.yml
@@ -0,0 +1,7 @@
+name: NiP
+pattern: (?<=^|[\s.-])NiP\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/Nordic.yml b/regex_patterns/Nordic.yml
new file mode 100644
index 0000000..26c8a36
--- /dev/null
+++ b/regex_patterns/Nordic.yml
@@ -0,0 +1,7 @@
+name: Nordic
+pattern: \b(Nordic)\b
+description: Matches releases with the word Nordic
+tags:
+- Aspect Ratio
+- Enhancement
+tests: []
diff --git a/regex_patterns/Orphan.yml b/regex_patterns/Orphan.yml
new file mode 100644
index 0000000..adb90c2
--- /dev/null
+++ b/regex_patterns/Orphan.yml
@@ -0,0 +1,7 @@
+name: Orphan
+pattern: (?<=^|[\s.-])Orphan\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/PiRAMiDHEAD.yml b/regex_patterns/PiRAMiDHEAD.yml
new file mode 100644
index 0000000..fa5f9fd
--- /dev/null
+++ b/regex_patterns/PiRAMiDHEAD.yml
@@ -0,0 +1,7 @@
+name: PiRAMiDHEAD
+pattern: (?<=^|[\s.-])PiRAMiDHEAD\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
diff --git a/regex_patterns/QxR.yml b/regex_patterns/QxR.yml
index f56c9d8..527ff66 100644
--- a/regex_patterns/QxR.yml
+++ b/regex_patterns/QxR.yml
@@ -1,5 +1,5 @@
 name: QxR
-pattern: (?<=^|[\s.-])(QxR|afm72|Bandi|FreetheFish|Garshasp|Ghost|Ime|Kappa|Langbard|LION|Panda|MONOLITH|Natty|r00t|RCVR|RZeroX|SAMPA|Silence|t3nzin|Tigole|YOGI)\b
+pattern: (?<=^|[\s.-])(QxR|afm72|Bandi|Celdra|FreetheFish|Garshasp|Ghost|Ime|Kappa|Langbard|LION|Panda|MONOLITH|Natty|r00t|RCVR|RZeroX|SAMPA|Silence|t3nzin|Tigole|YOGI)\b
 description: ''
 tags:
 - Release Group
diff --git a/regex_patterns/RO.yml b/regex_patterns/RO.yml
new file mode 100644
index 0000000..b3836b0
--- /dev/null
+++ b/regex_patterns/RO.yml
@@ -0,0 +1,7 @@
+name: RO
+pattern: (?<=^|[\s.-])RO\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/ROCiNANTE.yml b/regex_patterns/ROCiNANTE.yml
new file mode 100644
index 0000000..d8e9426
--- /dev/null
+++ b/regex_patterns/ROCiNANTE.yml
@@ -0,0 +1,7 @@
+name: ROCiNANTE
+pattern: (?<=^|[\s.-])ROCiNANTE\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/RiCO.yml b/regex_patterns/RiCO.yml
new file mode 100644
index 0000000..5d06dd8
--- /dev/null
+++ b/regex_patterns/RiCO.yml
@@ -0,0 +1,7 @@
+name: RiCO
+pattern: (?<=^|[\s.-])RiCO\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/Skazhutin.yml b/regex_patterns/Skazhutin.yml
new file mode 100644
index 0000000..b765b8a
--- /dev/null
+++ b/regex_patterns/Skazhutin.yml
@@ -0,0 +1,7 @@
+name: Skazhutin
+pattern: (?<=^|[\s.-])Skazhutin\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/Slappy.yml b/regex_patterns/Slappy.yml
new file mode 100644
index 0000000..d82c86a
--- /dev/null
+++ b/regex_patterns/Slappy.yml
@@ -0,0 +1,7 @@
+name: Slappy
+pattern: (?<=^|[\s.-])Slappy\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/ThD.yml b/regex_patterns/ThD.yml
new file mode 100644
index 0000000..632af35
--- /dev/null
+++ b/regex_patterns/ThD.yml
@@ -0,0 +1,7 @@
+name: ThD
+pattern: (?<=^|[\s.-])ThD\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/UDF.yml b/regex_patterns/UDF.yml
new file mode 100644
index 0000000..f51d8e5
--- /dev/null
+++ b/regex_patterns/UDF.yml
@@ -0,0 +1,7 @@
+name: UDF
+pattern: (?<=^|[\s.-])UDF\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/UHD Bluray Release Groups.yml b/regex_patterns/UHD Bluray Release Groups.yml
index 66aaa19..0d7ce03 100644
--- a/regex_patterns/UHD Bluray Release Groups.yml	
+++ b/regex_patterns/UHD Bluray Release Groups.yml	
@@ -1,6 +1,5 @@
 name: UHD Bluray Release Groups
-pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BV|Chotab|CJ|c0kE|CRiSC|CRX|CtrlHD|Dariush|de[42]|
-  decibel|DON|D-Z0N3|E.N.D|E1|EDPH|EbP|ESiR|EXCiSION|FilmHD|FoRM|FraMeSToR|FTW-HD|GALAXY|Geek|GS88|HANDJOB|hdalx|HDC|HDMaNiAcS|HiDt|HiFi|HiP|IDE|iFT|iON|KASHMiR|Kitsune|LEGi0N|LiNG|LolHD|LoRD|luvBB|MTeam|NCmt|nmd|NTb|NyHD|ORiGEN|P0W4HD|Penumbra|playHD|Positive|PTer|REBORN|rightSIZE|rttr|SA89|SaNcTi|SbR|SiMPLE|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|TnP|VLAD|VietHD|W4NK3R|WiKi|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b
+pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BSTD|BV|c0kE|Chotab|CJ|coffee|CRiSC|CRX|CtrlHD|Dariush|de[42]|decibel|DON|D-Z0N3|E.N.D|E1|EA|EDPH|EbP|ESiR|EXCiSION|FoRM|FraMeSToR|GALAXY|Geek|GS88|hdalx|HDMaNiAcS|HiDt|HiFi|HiP|IDE|iFT|KASHMiR|Kitsune|LEGi0N|LiNG|LolHD|LoRD|luvBB|NCmt|NiBuRu|nmd|NTb|NyHD|ORiGEN|Penumbra|playHD|Positive|PTer|REBORN|RiCO|rightSIZE|RO|rttr|SA89|SaNcTi|SbR|SiMPLE|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|TnP|VLAD|VietHD|W4NK3R|WiLF|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b
 description: Match release groups who should not be categorized as UHD Bluray
 tags: []
 tests: []
diff --git a/regex_patterns/WiLF.yml b/regex_patterns/WiLF.yml
new file mode 100644
index 0000000..f022a7e
--- /dev/null
+++ b/regex_patterns/WiLF.yml
@@ -0,0 +1,7 @@
+name: WiLF
+pattern: (?<=^|[\s.-])WiLF\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/coffee.yml b/regex_patterns/coffee.yml
new file mode 100644
index 0000000..cde74a6
--- /dev/null
+++ b/regex_patterns/coffee.yml
@@ -0,0 +1,7 @@
+name: coffee
+pattern: (?<=^|[\s.-])coffee\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/hydes.yml b/regex_patterns/hydes.yml
new file mode 100644
index 0000000..74caced
--- /dev/null
+++ b/regex_patterns/hydes.yml
@@ -0,0 +1,7 @@
+name: hydes
+pattern: (?<=^|[\s.-])hydes\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/kBaraka.yml b/regex_patterns/kBaraka.yml
new file mode 100644
index 0000000..0d0aa28
--- /dev/null
+++ b/regex_patterns/kBaraka.yml
@@ -0,0 +1,7 @@
+name: kBaraka
+pattern: (?<=^|[\s.-])kBaraka\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []
diff --git a/regex_patterns/mottoj.yml b/regex_patterns/mottoj.yml
new file mode 100644
index 0000000..29f1574
--- /dev/null
+++ b/regex_patterns/mottoj.yml
@@ -0,0 +1,7 @@
+name: mottoj
+pattern: (?<=^|[\s.-])mottoj\b
+description: ''
+tags:
+- Release Group
+- Anime
+tests: []