diff --git a/custom_formats/1080p Bluray.yml b/custom_formats/1080p Bluray.yml
index f57c58c..e6277df 100644
--- a/custom_formats/1080p Bluray.yml	
+++ b/custom_formats/1080p Bluray.yml	
@@ -13,4 +13,9 @@ conditions:
   required: true
   source: bluray
   type: source
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 tests: []
diff --git a/custom_formats/1080p Quality Tier 1.yml b/custom_formats/1080p Quality Tier 1.yml
index 2e2a952..01e7e2a 100644
--- a/custom_formats/1080p Quality Tier 1.yml	
+++ b/custom_formats/1080p Quality Tier 1.yml	
@@ -11,11 +11,21 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
+- name: Not Remux
   negate: true
-  source: web_dl
+  pattern: Remux
+  required: true
+  type: release_title
+- name: Bluray
+  type: source
+  required: false
+  negate: false
+  source: bluray
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
 - name: DON
   negate: false
   pattern: DON
diff --git a/custom_formats/1080p Quality Tier 2.yml b/custom_formats/1080p Quality Tier 2.yml
index 29b1016..11ae4cf 100644
--- a/custom_formats/1080p Quality Tier 2.yml	
+++ b/custom_formats/1080p Quality Tier 2.yml	
@@ -11,10 +11,20 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
+- name: Not Remux
   negate: true
+  pattern: Remux
   required: true
-  source: web_dl
+  type: release_title
+- name: Bluray
+  type: source
+  required: false
+  negate: false
+  source: bluray
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: c0kE
   negate: false
diff --git a/custom_formats/1080p Quality Tier 3.yml b/custom_formats/1080p Quality Tier 3.yml
index 6a0ad68..5825927 100644
--- a/custom_formats/1080p Quality Tier 3.yml	
+++ b/custom_formats/1080p Quality Tier 3.yml	
@@ -11,11 +11,21 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
+- name: Not Remux
   negate: true
-  source: web_dl
+  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: CRiSC
   negate: false
   pattern: CRiSC
diff --git a/custom_formats/1080p Quality Tier 4.yml b/custom_formats/1080p Quality Tier 4.yml
index 2730a38..cbd6d69 100644
--- a/custom_formats/1080p Quality Tier 4.yml	
+++ b/custom_formats/1080p Quality Tier 4.yml	
@@ -11,10 +11,20 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
+- name: Not Remux
   negate: true
+  pattern: Remux
   required: true
-  source: web_dl
+  type: release_title
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: BMF
   negate: false
diff --git a/custom_formats/1080p Quality Tier 5.yml b/custom_formats/1080p Quality Tier 5.yml
index 3b942df..ad9e88e 100644
--- a/custom_formats/1080p Quality Tier 5.yml	
+++ b/custom_formats/1080p Quality Tier 5.yml	
@@ -11,21 +11,31 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
+- name: Not Remux
   negate: true
+  pattern: Remux
   required: true
-  source: web_dl
+  type: release_title
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
-- name: Not DVD
-  negate: true
-  required: true
-  source: dvd
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: AJP69
   negate: false
   pattern: AJP69
   required: false
   type: release_group
+- name: ATELiER
+  negate: false
+  pattern: ATELiER
+  required: false
+  type: release_group
 - name: BV
   negate: false
   pattern: BV
@@ -111,6 +121,16 @@ conditions:
   pattern: hdalx
   required: false
   type: release_group
+- name: HQMUX
+  type: release_group
+  required: false
+  negate: false
+  pattern: HQMUX
+- name: HDC
+  negate: false
+  pattern: HDC
+  required: false
+  type: release_group
 - name: iON
   negate: false
   pattern: iON
@@ -121,6 +141,11 @@ conditions:
   pattern: KASHMiR
   required: false
   type: release_group
+- name: Kitsune
+  negate: false
+  pattern: Kitsune
+  required: false
+  type: release_group
 - name: LEGi0N
   negate: false
   pattern: LEGi0N
@@ -186,6 +211,11 @@ conditions:
   pattern: PTer
   required: false
   type: release_group
+- name: REBORN
+  negate: false
+  pattern: REBORN
+  required: false
+  type: release_group
 - name: rightSIZE
   negate: false
   pattern: rightSIZE
@@ -211,11 +241,21 @@ 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
   required: false
   type: release_group
+- name: SPHD
+  negate: false
+  pattern: SPHD
+  required: false
+  type: release_group
 - name: TBB
   negate: false
   pattern: TBB
@@ -226,6 +266,16 @@ conditions:
   pattern: TDD
   required: false
   type: release_group
+- name: TeamSyndicate
+  negate: false
+  pattern: TeamSyndicate
+  required: false
+  type: release_group
+- name: TnP
+  negate: false
+  pattern: TnP
+  required: false
+  type: release_group
 - name: VLAD
   negate: false
   pattern: VLAD
@@ -236,6 +286,11 @@ conditions:
   pattern: W4NK3R
   required: false
   type: release_group
+- name: WiKi
+  negate: false
+  pattern: WiKi
+  required: false
+  type: release_group
 - name: xander
   negate: false
   pattern: xander
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 9b9ce19..793ec63 100644
--- a/custom_formats/2160p Quality Tier 3.yml	
+++ b/custom_formats/2160p Quality Tier 3.yml	
@@ -15,21 +15,36 @@ 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
+  required: false
+  type: release_group
 - name: Chotab
   negate: false
   pattern: Chotab
   required: false
   type: release_group
-- name: Kitsune
-  negate: false
-  pattern: Kitsune
-  required: false
-  type: release_group
 - name: REBORN
   negate: false
   pattern: REBORN
   required: false
   type: release_group
+- name: SoLaR
+  negate: false
+  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 e66a2ec..8e052f5 100644
--- a/custom_formats/2160p Quality Tier 4.yml	
+++ b/custom_formats/2160p Quality Tier 4.yml	
@@ -15,26 +15,56 @@ 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
-  type: release_group
-  required: false
+- 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
+  negate: false
+  pattern: HiDt
+  required: false
+  type: release_group
 - name: iFT
   negate: false
   pattern: iFT
   required: false
   type: release_group
+- name: Kitsune
+  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 77e19cf..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,31 +120,11 @@ conditions:
   pattern: ReQuEsT
   required: false
   type: release_group
-- name: SMAHAWUG
-  negate: false
-  pattern: SMAHAWUG
-  required: false
-  type: release_group
-- name: SoLaR
-  negate: false
-  pattern: SoLaR
-  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
@@ -190,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/2160p Quality Tier 7.yml b/custom_formats/2160p Quality Tier 7.yml
deleted file mode 100644
index 90d8eb5..0000000
--- a/custom_formats/2160p Quality Tier 7.yml	
+++ /dev/null
@@ -1,83 +0,0 @@
-name: 2160p Quality Tier 7
-description: Matches release groups who fall under 2160p Quality Tier 6
-tags:
-- Release Group Tier
-- 2160p
-- Quality
-conditions:
-- name: 2160p
-  negate: false
-  required: true
-  resolution: 2160p
-  type: resolution
-- name: Bluray
-  negate: false
-  required: true
-  source: bluray
-  type: source
-- name: BeiTai
-  negate: false
-  pattern: BeiTai
-  required: false
-  type: release_group
-- name: BLUEBIRD
-  negate: false
-  pattern: BLUEBIRD
-  required: false
-  type: release_group
-- name: BOREDOR
-  negate: false
-  pattern: BOREDOR
-  required: false
-  type: release_group
-- name: CHAOS
-  negate: false
-  pattern: CHAOS
-  required: false
-  type: release_group
-- name: dkore
-  negate: false
-  pattern: dkore
-  required: false
-  type: release_group
-- name: FLAME
-  negate: false
-  pattern: FLAME
-  required: false
-  type: release_group
-- name: Hares
-  negate: false
-  pattern: Hares
-  required: false
-  type: release_group
-- name: LittleBakas
-  negate: false
-  pattern: LittleBakas
-  required: false
-  type: release_group
-- name: Lucifer
-  negate: false
-  pattern: Lucifer
-  required: false
-  type: release_group
-- name: micius
-  negate: false
-  pattern: micius
-  required: false
-  type: release_group
-- name: PTH
-  negate: false
-  pattern: PTH
-  required: false
-  type: release_group
-- name: THREESOME
-  negate: false
-  pattern: THREESOME
-  required: false
-  type: release_group
-- name: UHDCLUBREMUX
-  negate: false
-  pattern: UHDCLUBREMUX
-  required: false
-  type: release_group
-tests: []
diff --git a/custom_formats/720p Quality Tier 1.yml b/custom_formats/720p Quality Tier 1.yml
index 2a493c8..6c2c54d 100644
--- a/custom_formats/720p Quality Tier 1.yml	
+++ b/custom_formats/720p Quality Tier 1.yml	
@@ -11,11 +11,16 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
 - name: DON
   negate: false
   pattern: DON
diff --git a/custom_formats/720p Quality Tier 2.yml b/custom_formats/720p Quality Tier 2.yml
index 6de3844..0f9513e 100644
--- a/custom_formats/720p Quality Tier 2.yml	
+++ b/custom_formats/720p Quality Tier 2.yml	
@@ -11,10 +11,15 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: CRiSC
   negate: false
@@ -56,6 +61,11 @@ 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 4f0ec62..c5a5bc6 100644
--- a/custom_formats/720p Quality Tier 3.yml	
+++ b/custom_formats/720p Quality Tier 3.yml	
@@ -11,11 +11,16 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
 - name: BMF
   negate: false
   pattern: BMF
diff --git a/custom_formats/720p Quality Tier 4.yml b/custom_formats/720p Quality Tier 4.yml
index 156027e..997bef6 100644
--- a/custom_formats/720p Quality Tier 4.yml	
+++ b/custom_formats/720p Quality Tier 4.yml	
@@ -11,41 +11,46 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
-- name: Dariush
-  type: release_group
+- name: Bluray
+  negate: false
   required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
+- name: Dariush
   negate: false
   pattern: Dariush
-- name: D-ZON3
-  type: release_group
   required: false
+  type: release_group
+- name: D-ZON3
   negate: false
   pattern: D-Z0N3
+  required: false
+  type: release_group
 - name: EA
   negate: false
   pattern: EA
   required: false
   type: release_group
 - name: FoRM
-  type: release_group
-  required: false
   negate: false
   pattern: FoRM
-- name: NTb
-  type: release_group
   required: false
+  type: release_group
+- name: NTb
   negate: false
   pattern: NTb
-- name: PTer
-  type: release_group
   required: false
+  type: release_group
+- name: PTer
   negate: false
   pattern: PTer
+  required: false
+  type: release_group
 - name: TDD
   negate: false
   pattern: TDD
diff --git a/custom_formats/720p Quality Tier 5.yml b/custom_formats/720p Quality Tier 5.yml
index 07b0465..513ad06 100644
--- a/custom_formats/720p Quality Tier 5.yml	
+++ b/custom_formats/720p Quality Tier 5.yml	
@@ -11,11 +11,16 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
 - name: Chotab
   negate: false
   pattern: Chotab
@@ -62,10 +67,10 @@ conditions:
   required: false
   type: release_group
 - name: NyHD
-  type: release_group
-  required: false
   negate: false
   pattern: NyHD
+  required: false
+  type: release_group
 - name: ORiGEN
   negate: false
   pattern: ORiGEN
diff --git a/custom_formats/Banned Groups (Efficient).yml b/custom_formats/Banned Groups (Efficient).yml
index e988d90..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
@@ -184,11 +189,6 @@ conditions:
   pattern: VisionXpert
   required: false
   type: release_group
-- name: WiKi
-  negate: false
-  pattern: WiKi
-  required: false
-  type: release_group
 - name: x0r
   negate: false
   pattern: x0r
diff --git a/custom_formats/Banned Groups.yml b/custom_formats/Banned Groups.yml
index 8318bd8..68d0aaf 100644
--- a/custom_formats/Banned Groups.yml	
+++ b/custom_formats/Banned Groups.yml	
@@ -70,10 +70,10 @@ conditions:
   required: false
   type: release_group
 - name: DeViSiVE
-  type: release_group
-  required: false
   negate: false
   pattern: DeViSiVE
+  required: false
+  type: release_group
 - name: DRX
   negate: false
   pattern: DRX
@@ -199,6 +199,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
@@ -209,11 +214,6 @@ conditions:
   pattern: VisionXpert
   required: false
   type: release_group
-- name: WiKi
-  negate: false
-  pattern: WiKi
-  required: false
-  type: release_group
 - name: x0r
   negate: false
   pattern: x0r
diff --git a/custom_formats/Banned UHD Bluray.yml b/custom_formats/Banned UHD Bluray.yml
new file mode 100644
index 0000000..2c84f09
--- /dev/null
+++ b/custom_formats/Banned UHD Bluray.yml	
@@ -0,0 +1,22 @@
+name: Banned UHD Bluray
+description: Matches UHD Bluray releases that are not from a quality tier
+tags:
+- Banned
+- Release Group
+conditions:
+- name: UHD Bluray
+  negate: false
+  pattern: UHD Bluray
+  required: true
+  type: release_title
+- name: Not 2160p
+  type: resolution
+  required: true
+  negate: true
+  resolution: 2160p
+- name: Release Groups
+  negate: true
+  pattern: UHD Bluray Release Groups
+  required: true
+  type: release_group
+tests: []
diff --git a/custom_formats/Banned WEBRip (Efficient).yml b/custom_formats/Banned WEBRip (Efficient).yml
index d99cfbb..d0dc81b 100644
--- a/custom_formats/Banned WEBRip (Efficient).yml	
+++ b/custom_formats/Banned WEBRip (Efficient).yml	
@@ -14,359 +14,9 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: AJP69
-  negate: true
-  pattern: AJP69
-  required: true
-  type: release_group
-- name: BMF
-  negate: true
-  pattern: BMF
-  required: true
-  type: release_group
-- name: BV
-  negate: true
-  pattern: BV
-  required: true
-  type: release_group
-- name: c0kE
-  negate: true
-  pattern: c0kE
-  required: true
-  type: release_group
-- name: Chotab
-  negate: true
-  pattern: Chotab
-  required: true
-  type: release_group
-- name: CJ
-  negate: true
-  pattern: CJ
-  required: true
-  type: release_group
-- name: CRiSC
-  negate: true
-  pattern: CRiSC
-  required: true
-  type: release_group
-- name: CRX
-  negate: true
-  pattern: CRX
-  required: true
-  type: release_group
-- name: CtrlHD
-  negate: true
-  pattern: CtrlHD
-  required: true
-  type: release_group
-- name: Dariush
-  negate: true
-  pattern: Dariush
-  required: true
-  type: release_group
-- name: de[42]
-  negate: true
-  pattern: de[42]
-  required: true
-  type: release_group
-- name: decibeL
-  negate: true
-  pattern: decibeL
-  required: true
-  type: release_group
-- name: DON
-  negate: true
-  pattern: DON
-  required: true
-  type: release_group
-- name: D-Z0N3
-  negate: true
-  pattern: D-Z0N3
-  required: true
-  type: release_group
-- name: E1
-  negate: true
-  pattern: E1
-  required: true
-  type: release_group
-- name: EbP
-  negate: true
-  pattern: EbP
-  required: true
-  type: release_group
-- name: EDPH
-  negate: true
-  pattern: EDPH
-  required: true
-  type: release_group
-- name: E.N.D
-  negate: true
-  pattern: E.N.D
-  required: true
-  type: release_group
-- name: ESiR
-  negate: true
-  pattern: ESiR
-  required: true
-  type: release_group
-- name: EXCiSION
-  negate: true
-  pattern: EXCiSION
-  required: true
-  type: release_group
-- name: FilmHD
-  negate: true
-  pattern: FilmHD
-  required: true
-  type: release_group
-- name: FoRM
-  negate: true
-  pattern: FoRM
-  required: true
-  type: release_group
-- name: FraMeSToR
-  negate: true
-  pattern: FraMeSToR
-  required: true
-  type: release_group
-- name: FTW-HD
-  negate: true
-  pattern: FTW-HD
-  required: true
-  type: release_group
-- name: GALAXY
-  negate: true
-  pattern: GALAXY
-  required: true
-  type: release_group
-- name: Geek
-  negate: true
-  pattern: Geek
-  required: true
-  type: release_group
-- name: GS88
-  negate: true
-  pattern: GS88
-  required: true
-  type: release_group
-- name: HANDJOB
-  negate: true
-  pattern: HANDJOB
-  required: true
-  type: release_group
-- name: hdalx
-  negate: true
-  pattern: hdalx
-  required: true
-  type: release_group
-- name: HDMaNiAcS
-  negate: true
-  pattern: HDMaNiAcS
-  required: true
-  type: release_group
-- name: HiDt
-  negate: true
-  pattern: HiDt
-  required: true
-  type: release_group
-- name: HiFi
-  negate: true
-  pattern: HiFi
-  required: true
-  type: release_group
-- name: HiP
-  negate: true
-  pattern: HiP
-  required: true
-  type: release_group
-- name: IDE
-  negate: true
-  pattern: IDE
-  required: true
-  type: release_group
-- name: iFT
-  negate: true
-  pattern: iFT
-  required: true
-  type: release_group
-- name: iON
-  negate: true
-  pattern: iON
-  required: true
-  type: release_group
-- name: KASHMiR
-  negate: true
-  pattern: KASHMiR
-  required: true
-  type: release_group
-- name: LEGi0N
-  negate: true
-  pattern: LEGi0N
-  required: true
+- name: Release Groups
   type: release_group
-- name: LiNG
-  negate: true
-  pattern: LiNG
   required: true
-  type: release_group
-- name: LolHD
   negate: true
-  pattern: LolHD
-  required: true
-  type: release_group
-- name: LoRD
-  negate: true
-  pattern: LoRD
-  required: true
-  type: release_group
-- name: luvBB
-  negate: true
-  pattern: luvBB
-  required: true
-  type: release_group
-- name: MTeam
-  negate: true
-  pattern: MTeam
-  required: true
-  type: release_group
-- name: NCmt
-  negate: true
-  pattern: NCmt
-  required: true
-  type: release_group
-- name: nmd
-  negate: true
-  pattern: nmd
-  required: true
-  type: release_group
-- name: NTb
-  negate: true
-  pattern: NTb
-  required: true
-  type: release_group
-- name: NyHD
-  negate: true
-  pattern: NyHD
-  required: true
-  type: release_group
-- name: ORiGEN
-  negate: true
-  pattern: ORiGEN
-  required: true
-  type: release_group
-- name: P0W4HD
-  negate: true
-  pattern: P0W4HD
-  required: true
-  type: release_group
-- name: Penumbra
-  negate: true
-  pattern: Penumbra
-  required: true
-  type: release_group
-- name: playHD
-  negate: true
-  pattern: playHD
-  required: true
-  type: release_group
-- name: Positive
-  negate: true
-  pattern: Positive
-  required: true
-  type: release_group
-- name: PTer
-  negate: true
-  pattern: PTer
-  required: true
-  type: release_group
-- name: rightSIZE
-  negate: true
-  pattern: rightSIZE
-  required: true
-  type: release_group
-- name: rttr
-  negate: true
-  pattern: rttr
-  required: true
-  type: release_group
-- name: SA89
-  negate: true
-  pattern: SA89
-  required: true
-  type: release_group
-- name: SaNcTi
-  negate: true
-  pattern: SaNcTi
-  required: true
-  type: release_group
-- name: SbR
-  negate: true
-  pattern: SbR
-  required: true
-  type: release_group
-- name: SiMPLE
-  negate: true
-  pattern: SiMPLE
-  required: true
-  type: release_group
-- name: SOP
-  negate: true
-  pattern: SOP
-  required: true
-  type: release_group
-- name: TayTo
-  negate: true
-  pattern: TayTo
-  required: true
-  type: release_group
-- name: TBB
-  negate: true
-  pattern: TBB
-  required: true
-  type: release_group
-- name: TDD
-  negate: true
-  pattern: TDD
-  required: true
-  type: release_group
-- name: VietHD
-  negate: true
-  pattern: VietHD
-  required: true
-  type: release_group
-- name: VLAD
-  negate: true
-  pattern: VLAD
-  required: true
-  type: release_group
-- name: W4NK3R
-  negate: true
-  pattern: W4NK3R
-  required: true
-  type: release_group
-- name: WMING
-  negate: true
-  pattern: WMING
-  required: true
-  type: release_group
-- name: xander
-  negate: true
-  pattern: xander
-  required: true
-  type: release_group
-- name: ZIMBO
-  negate: true
-  pattern: ZIMBO
-  required: true
-  type: release_group
-- name: ZQ
-  negate: true
-  pattern: ZQ
-  required: true
-  type: release_group
-- name: ZoroSenpai
-  negate: true
-  pattern: ZoroSenpai
-  required: true
-  type: release_group
+  pattern: UHD Bluray Release Groups
 tests: []
diff --git a/custom_formats/Banned WEBRip.yml b/custom_formats/Banned WEBRip.yml
index 626270b..5830f1e 100644
--- a/custom_formats/Banned WEBRip.yml	
+++ b/custom_formats/Banned WEBRip.yml	
@@ -9,359 +9,9 @@ conditions:
   required: true
   source: webrip
   type: source
-- name: AJP69
-  negate: true
-  pattern: AJP69
-  required: true
-  type: release_group
-- name: BMF
-  negate: true
-  pattern: BMF
-  required: true
-  type: release_group
-- name: BV
-  negate: true
-  pattern: BV
-  required: true
-  type: release_group
-- name: c0kE
-  negate: true
-  pattern: c0kE
-  required: true
-  type: release_group
-- name: Chotab
-  negate: true
-  pattern: Chotab
-  required: true
-  type: release_group
-- name: CJ
-  negate: true
-  pattern: CJ
-  required: true
-  type: release_group
-- name: CRiSC
-  negate: true
-  pattern: CRiSC
-  required: true
-  type: release_group
-- name: CRX
-  negate: true
-  pattern: CRX
-  required: true
-  type: release_group
-- name: CtrlHD
-  negate: true
-  pattern: CtrlHD
-  required: true
-  type: release_group
-- name: Dariush
-  negate: true
-  pattern: Dariush
-  required: true
-  type: release_group
-- name: de[42]
-  negate: true
-  pattern: de[42]
-  required: true
-  type: release_group
-- name: decibeL
-  negate: true
-  pattern: decibeL
-  required: true
-  type: release_group
-- name: DON
-  negate: true
-  pattern: DON
-  required: true
-  type: release_group
-- name: D-Z0N3
-  negate: true
-  pattern: D-Z0N3
-  required: true
-  type: release_group
-- name: E1
-  negate: true
-  pattern: E1
-  required: true
-  type: release_group
-- name: EbP
-  negate: true
-  pattern: EbP
-  required: true
-  type: release_group
-- name: EDPH
-  negate: true
-  pattern: EDPH
-  required: true
-  type: release_group
-- name: E.N.D
-  negate: true
-  pattern: E.N.D
-  required: true
-  type: release_group
-- name: ESiR
-  negate: true
-  pattern: ESiR
-  required: true
-  type: release_group
-- name: EXCiSION
-  negate: true
-  pattern: EXCiSION
-  required: true
-  type: release_group
-- name: FilmHD
-  negate: true
-  pattern: FilmHD
-  required: true
-  type: release_group
-- name: FoRM
-  negate: true
-  pattern: FoRM
-  required: true
-  type: release_group
-- name: FraMeSToR
-  negate: true
-  pattern: FraMeSToR
-  required: true
-  type: release_group
-- name: FTW-HD
-  negate: true
-  pattern: FTW-HD
-  required: true
-  type: release_group
-- name: GALAXY
-  negate: true
-  pattern: GALAXY
-  required: true
-  type: release_group
-- name: Geek
-  negate: true
-  pattern: Geek
-  required: true
-  type: release_group
-- name: GS88
-  negate: true
-  pattern: GS88
-  required: true
-  type: release_group
-- name: HANDJOB
-  negate: true
-  pattern: HANDJOB
-  required: true
-  type: release_group
-- name: hdalx
-  negate: true
-  pattern: hdalx
-  required: true
-  type: release_group
-- name: HDMaNiAcS
-  negate: true
-  pattern: HDMaNiAcS
-  required: true
-  type: release_group
-- name: HiDt
-  negate: true
-  pattern: HiDt
-  required: true
-  type: release_group
-- name: HiFi
-  negate: true
-  pattern: HiFi
-  required: true
-  type: release_group
-- name: HiP
-  negate: true
-  pattern: HiP
-  required: true
-  type: release_group
-- name: IDE
-  negate: true
-  pattern: IDE
-  required: true
-  type: release_group
-- name: iFT
-  negate: true
-  pattern: iFT
-  required: true
-  type: release_group
-- name: iON
-  negate: true
-  pattern: iON
-  required: true
-  type: release_group
-- name: KASHMiR
-  negate: true
-  pattern: KASHMiR
-  required: true
-  type: release_group
-- name: LEGi0N
-  negate: true
-  pattern: LEGi0N
-  required: true
+- name: Release Groups
   type: release_group
-- name: LiNG
-  negate: true
-  pattern: LiNG
   required: true
-  type: release_group
-- name: LolHD
   negate: true
-  pattern: LolHD
-  required: true
-  type: release_group
-- name: LoRD
-  negate: true
-  pattern: LoRD
-  required: true
-  type: release_group
-- name: luvBB
-  negate: true
-  pattern: luvBB
-  required: true
-  type: release_group
-- name: MTeam
-  negate: true
-  pattern: MTeam
-  required: true
-  type: release_group
-- name: NCmt
-  negate: true
-  pattern: NCmt
-  required: true
-  type: release_group
-- name: nmd
-  negate: true
-  pattern: nmd
-  required: true
-  type: release_group
-- name: NTb
-  negate: true
-  pattern: NTb
-  required: true
-  type: release_group
-- name: NyHD
-  negate: true
-  pattern: NyHD
-  required: true
-  type: release_group
-- name: ORiGEN
-  negate: true
-  pattern: ORiGEN
-  required: true
-  type: release_group
-- name: P0W4HD
-  negate: true
-  pattern: P0W4HD
-  required: true
-  type: release_group
-- name: Penumbra
-  negate: true
-  pattern: Penumbra
-  required: true
-  type: release_group
-- name: playHD
-  negate: true
-  pattern: playHD
-  required: true
-  type: release_group
-- name: Positive
-  negate: true
-  pattern: Positive
-  required: true
-  type: release_group
-- name: PTer
-  negate: true
-  pattern: PTer
-  required: true
-  type: release_group
-- name: rightSIZE
-  negate: true
-  pattern: rightSIZE
-  required: true
-  type: release_group
-- name: rttr
-  negate: true
-  pattern: rttr
-  required: true
-  type: release_group
-- name: SA89
-  negate: true
-  pattern: SA89
-  required: true
-  type: release_group
-- name: SaNcTi
-  negate: true
-  pattern: SaNcTi
-  required: true
-  type: release_group
-- name: SbR
-  negate: true
-  pattern: SbR
-  required: true
-  type: release_group
-- name: SiMPLE
-  negate: true
-  pattern: SiMPLE
-  required: true
-  type: release_group
-- name: SOP
-  negate: true
-  pattern: SOP
-  required: true
-  type: release_group
-- name: TayTo
-  negate: true
-  pattern: TayTo
-  required: true
-  type: release_group
-- name: TBB
-  negate: true
-  pattern: TBB
-  required: true
-  type: release_group
-- name: TDD
-  negate: true
-  pattern: TDD
-  required: true
-  type: release_group
-- name: VietHD
-  negate: true
-  pattern: VietHD
-  required: true
-  type: release_group
-- name: VLAD
-  negate: true
-  pattern: VLAD
-  required: true
-  type: release_group
-- name: W4NK3R
-  negate: true
-  pattern: W4NK3R
-  required: true
-  type: release_group
-- name: WMING
-  negate: true
-  pattern: WMING
-  required: true
-  type: release_group
-- name: xander
-  negate: true
-  pattern: xander
-  required: true
-  type: release_group
-- name: ZIMBO
-  negate: true
-  pattern: ZIMBO
-  required: true
-  type: release_group
-- name: ZQ
-  negate: true
-  pattern: ZQ
-  required: true
-  type: release_group
-- name: ZoroSenpai
-  negate: true
-  pattern: ZoroSenpai
-  required: true
-  type: release_group
+  pattern: UHD Bluray Release Groups
 tests: []
diff --git a/custom_formats/HDR10 (Missing) (1080p).yml b/custom_formats/HDR (Missing).yml
similarity index 89%
rename from custom_formats/HDR10 (Missing) (1080p).yml
rename to custom_formats/HDR (Missing).yml
index ce61859..0ecd88c 100644
--- a/custom_formats/HDR10 (Missing) (1080p).yml	
+++ b/custom_formats/HDR (Missing).yml	
@@ -1,5 +1,5 @@
-name: HDR10 (Missing) (1080p)
-description: Attempts to match HDR10 in 1080p x265 Encodes labelled with x265
+name: HDR (Missing)
+description: Attempts to match HDR in 1080p x265 Encodes labelled with x265
 tags:
 - Colour Grade
 - HDR
@@ -30,15 +30,15 @@ conditions:
   required: true
   type: release_title
 - name: Not PQ
-  type: release_title
-  required: true
   negate: true
   pattern: PQ
-- name: Not HLG
-  type: release_title
   required: true
+  type: release_title
+- name: Not HLG
   negate: true
   pattern: HLG
+  required: true
+  type: release_title
 - name: Not HDR
   negate: true
   pattern: HDR
diff --git a/custom_formats/HDR10 (Missing).yml b/custom_formats/HDR10 (Missing).yml
index fc8ae4b..46b48e0 100644
--- a/custom_formats/HDR10 (Missing).yml	
+++ b/custom_formats/HDR10 (Missing).yml	
@@ -10,16 +10,16 @@ conditions:
   required: true
   resolution: 2160p
   type: resolution
-- name: Not WEB-DL
-  negate: true
+- name: Bluray
+  negate: false
   required: true
-  source: web_dl
+  source: bluray
   type: source
 - name: Release Groups
-  type: release_group
-  required: true
   negate: true
   pattern: HDR10 (Negation)
+  required: true
+  type: release_group
 - name: Not SDR
   negate: true
   pattern: SDR
diff --git a/custom_formats/UHD Bluray.yml b/custom_formats/UHD Bluray.yml
index a10855d..ebfb46c 100644
--- a/custom_formats/UHD Bluray.yml	
+++ b/custom_formats/UHD Bluray.yml	
@@ -12,10 +12,10 @@ tags:
 - Storage
 conditions:
 - name: 1080p
-  type: resolution
-  required: true
   negate: false
+  required: true
   resolution: 1080p
+  type: resolution
 - name: UHD Bluray
   negate: false
   pattern: UHD Bluray
@@ -27,9 +27,9 @@ conditions:
   required: true
   type: release_title
 - name: Release Groups
-  negate: true
-  pattern: UHD Bluray (Negation)
-  required: false
+  negate: false
+  pattern: UHD Bluray Release Groups
+  required: true
   type: release_group
 tests:
 - conditionResults:
diff --git a/custom_formats/x265 (Remux).yml b/custom_formats/x265 (Remux).yml
new file mode 100644
index 0000000..c8e6406
--- /dev/null
+++ b/custom_formats/x265 (Remux).yml	
@@ -0,0 +1,21 @@
+name: x265 (Remux)
+description: Matches 'x265' regex pattern.
+tags:
+- Codec
+conditions:
+- name: x265
+  negate: false
+  pattern: HEVC
+  required: true
+  type: release_title
+- name: Remux
+  type: release_title
+  required: true
+  negate: false
+  pattern: Remux
+- name: Not 2160p
+  negate: true
+  required: true
+  resolution: 2160p
+  type: resolution
+tests: []
diff --git a/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml
index 32a1bb6..9478069 100644
--- a/profiles/1080p Balanced+.yml	
+++ b/profiles/1080p Balanced+.yml	
@@ -145,8 +145,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip
   score: -999999
 - name: Dolby Vision (Without Fallback)
diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml
index 7969451..4c95996 100644
--- a/profiles/1080p Balanced.yml	
+++ b/profiles/1080p Balanced.yml	
@@ -127,8 +127,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip
   score: -999999
 - name: Dolby Vision
diff --git a/profiles/1080p Efficient+.yml b/profiles/1080p Efficient+.yml
index 99f2eec..e2389ca 100644
--- a/profiles/1080p Efficient+.yml	
+++ b/profiles/1080p Efficient+.yml	
@@ -147,8 +147,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip (Efficient)
   score: -999999
 - name: Dolby Vision (Without Fallback)
diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml
index 5eb0d2d..3a1db16 100644
--- a/profiles/1080p Efficient.yml	
+++ b/profiles/1080p Efficient.yml	
@@ -138,8 +138,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip (Efficient)
   score: -999999
 - name: Dolby Vision (Without Fallback)
diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml
index 814c3e6..939904f 100644
--- a/profiles/1080p Quality (HDR).yml	
+++ b/profiles/1080p Quality (HDR).yml	
@@ -83,9 +83,9 @@ custom_formats:
   score: 1000
 - name: HDR
   score: 1000
-- name: HDR10
+- name: HDR (Missing)
   score: 1000
-- name: HDR10 (Missing) (1080p)
+- name: HDR10
   score: 1000
 - name: HLG
   score: 1000
@@ -155,7 +155,7 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
+- name: Banned UHD Bluray
   score: -999999
 - name: Banned WEBRip
   score: -999999
diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml
index 682924b..46697e2 100644
--- a/profiles/1080p Quality.yml	
+++ b/profiles/1080p Quality.yml	
@@ -134,8 +134,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip
   score: -999999
 - name: Dolby Vision
diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml
index a2af6a6..d3ea83a 100644
--- a/profiles/1080p Remux.yml	
+++ b/profiles/1080p Remux.yml	
@@ -1,70 +1,87 @@
 name: 1080p Remux
-description: '1080p Remux utilizes **Audio Formats** to prioritise high quality lossless
-  HD Blurays
+description: '1080p Remux+ utilizes **Audio Formats** to prioritise high quality lossless
+  HD Blurays as well as Transparent Bluray Encodes.
 
 
   - 1080p Remux
 
   - Fallbacks in Place for Proper Quality Progression
 
-  - 1080p Remux > 1080p WEB-DL > 720p WEB-DL > 480p WEB-DL > DVD'
+  - 1080p Remux > 1080p HDR Bluray > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p
+  WEB-DL > 480p WEB-DL > DVD'
 tags:
 - 1080p
 - Remux
 - Lossless Audio
 - h264
+- x264
+- x265
 upgradesAllowed: true
 minCustomFormatScore: 20000
 upgradeUntilScore: 400000
 minScoreIncrement: 1
 custom_formats:
 - name: 1080p Remux
-  score: 120000
+  score: 260000
+- name: UHD Bluray
+  score: 240000
+- name: UHD Bluray (Missing)
+  score: 240000
 - name: 1080p WEB-DL
-  score: 100000
+  score: 200000
+- name: 1080p Bluray
+  score: 140000
+- name: 1080p WEBRip
+  score: 140000
 - name: 720p WEB-DL
+  score: 100000
+- name: 1080p Quality Tier 1
+  score: 84000
+- name: 1080p Quality Tier 2
+  score: 83000
+- name: 1080p Quality Tier 3
+  score: 82000
+- name: 1080p Quality Tier 4
+  score: 81000
+- name: 1080p Quality Tier 5
   score: 80000
+- name: 720p Bluray
+  score: 80000
+- name: 720p WEBRip
+  score: 80000
+- name: 1080p Balanced Tier 1
+  score: 60000
 - name: 480p WEB-DL
   score: 60000
+- name: 720p Quality Tier 1
+  score: 44000
+- name: 720p Quality Tier 2
+  score: 43000
+- name: 720p Quality Tier 3
+  score: 42000
+- name: 720p Quality Tier 4
+  score: 41000
+- name: 720p Quality Tier 5
+  score: 40000
+- name: 720p Balanced Tier 1
+  score: 20000
 - name: DVD
   score: 20000
 - name: DVD Remux
   score: 20000
 - name: SD Quality Tier 1
   score: 11000
-- name: DTS-X
-  score: 10000
 - name: SD Quality Tier 2
   score: 10000
-- name: DTS-HD MA
-  score: 8000
-- name: TrueHD
-  score: 8000
-- name: TrueHD (Missing)
-  score: 8000
-- name: FLAC
-  score: 7000
-- name: PCM
-  score: 7000
-- name: DTS-HD HRA
-  score: 5000
-- name: Opus
-  score: 5000
-- name: Dolby Digital +
-  score: 4000
 - name: AMZN
   score: 3000
 - name: ATVP
   score: 3000
+- name: Dolby Vision
+  score: 3000
 - name: DSNP
   score: 3000
-- name: DTS-ES
-  score: 3000
-- name: Atmos
-  score: 2000
-- name: Atmos (Missing)
-  score: 2000
-- name: Dolby Digital
+- name: HDR10+
   score: 2000
 - name: HMAX
   score: 2000
@@ -72,28 +89,62 @@ custom_formats:
   score: 2000
 - name: ATV
   score: 1000
-- name: DTS
+- name: DTS-X
+  score: 1000
+- name: HDR
+  score: 1000
+- name: HDR (Missing)
+  score: 1000
+- name: HDR10
+  score: 1000
+- name: HLG
   score: 1000
 - name: iT
   score: 1000
 - name: NF
   score: 1000
-- name: WEB-DL Tier 1
+- name: PQ
+  score: 1000
+- name: DTS-HD MA
+  score: 800
+- name: TrueHD
+  score: 800
+- name: FLAC
+  score: 700
+- name: PCM
+  score: 700
+- name: DTS-HD HRA
+  score: 500
+- name: Opus
+  score: 500
+- name: Dolby Digital +
+  score: 400
+- name: DTS-ES
+  score: 300
+- name: Atmos
+  score: 200
+- name: Atmos (Missing)
+  score: 200
+- name: Dolby Digital
+  score: 200
+- name: DTS
   score: 100
 - name: Remux Tier 1
+  score: 100
+- name: WEB-DL Tier 1
+  score: 100
+- name: Remux Tier 2
   score: 80
 - name: WEB-DL Tier 2
   score: 80
-- name: Remux Tier 2
+- name: Remux Tier 3
   score: 60
 - name: WEB-DL Tier 3
   score: 60
-- name: Remux Tier 3
+- name: Remux Tier 4
   score: 40
 - name: WEB-DL Tier 4
   score: 40
-- name: Remux Tier 4
-  score: 20
 - name: WEB-DL Tier 5
   score: 20
 - name: Repack3
@@ -122,6 +173,8 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
 - name: B&W
@@ -132,9 +185,9 @@ custom_formats:
   score: -999999
 - name: Banned Remux
   score: -999999
-- name: Banned Scene
+- name: Banned UHD Bluray
   score: -999999
-- name: Dolby Vision
+- name: Banned WEBRip
   score: -999999
 - name: Dolby Vision (Without Fallback)
   score: -999999
@@ -142,27 +195,25 @@ custom_formats:
   score: -999999
 - name: h265
   score: -999999
-- name: HDR
-  score: -999999
-- name: HDR10
-  score: -999999
-- name: HDR10+
-  score: -999999
-- name: HLG
-  score: -999999
-- name: PQ
-  score: -999999
 - name: VP9
   score: -999999
 - name: VVC
   score: -999999
-- name: x265
+- name: x265 (Remux)
+  score: -999999
+- name: x265 (WEB)
   score: -999999
 - name: Xvid
   score: -999999
 custom_formats_radarr:
+- name: 1080p Golden Popcorn
+  score: 8000
+- name: 720p Golden Popcorn
+  score: 6000
 - name: MA
   score: 4000
+- name: SD Golden Popcorn
+  score: 4000
 - name: Better Theatricals
   score: 1000
 - name: CRIT
@@ -189,18 +240,39 @@ custom_formats_sonarr:
 qualities:
 - id: 8
   name: Remux-1080p
-- id: 9
-  name: WEBDL-1080p
-- id: 14
-  name: WEBDL-720p
 - id: -1
+  name: Transparent Capable
+  description: All capable of being indistinguishable from source. WEB-DL included
+    to not allow unknown encode to trump known WEB-DL.
+  qualities:
+  - id: 10
+    name: Bluray-1080p
+  - id: 9
+    name: WEBDL-1080p
+  - id: 11
+    name: WEBRip-1080p
+- id: -2
+  name: 720p Fallback
+  description: Fallback to 720p when 1080p cannot be found.
+  qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -3
   name: SD Fallback
   description: Standard Definition Fallbacks
   qualities:
-  - id: 22
-    name: DVD
+  - id: 18
+    name: Bluray-480p
   - id: 19
     name: WEBDL-480p
+  - id: 20
+    name: WEBRip-480p
+  - id: 22
+    name: DVD
 upgrade_until:
   id: 8
   name: Remux-1080p
diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml
index 7dd4634..671926c 100644
--- a/profiles/2160p Balanced.yml	
+++ b/profiles/2160p Balanced.yml	
@@ -81,9 +81,9 @@ custom_formats:
   score: 1000
 - name: HDR
   score: 1000
-- name: HDR10
+- name: HDR (Missing)
   score: 1000
-- name: HDR10 (Missing)
+- name: HDR10
   score: 1000
 - name: HLG
   score: 1000
@@ -151,7 +151,7 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
+- name: Banned UHD Bluray
   score: -999999
 - name: Banned WEBRip
   score: -999999
diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml
index d0154b0..b5ca951 100644
--- a/profiles/2160p Efficient.yml	
+++ b/profiles/2160p Efficient.yml	
@@ -144,8 +144,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip (Efficient)
   score: -999999
 - name: Dolby Vision (Without Fallback)
diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml
index 3060c5d..91a6c88 100644
--- a/profiles/2160p Quality.yml	
+++ b/profiles/2160p Quality.yml	
@@ -22,25 +22,23 @@ upgradeUntilScore: 400000
 minScoreIncrement: 1
 custom_formats:
 - 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 Balanced 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: 280000
-- name: 2160p WEB-DL
-  score: 280000
-- name: 2160p Quality Tier 6
-  score: 261000
-- name: 2160p Quality Tier 7
   score: 260000
+- name: 2160p WEB-DL
+  score: 260000
+- name: 2160p Quality Tier 6
+  score: 259000
 - name: UHD Bluray
   score: 240000
 - name: UHD Bluray (Missing)
@@ -103,6 +101,8 @@ custom_formats:
   score: 1000
 - name: HDR
   score: 1000
+- name: HDR (Missing)
+  score: 1000
 - name: HDR10
   score: 1000
 - name: HDR10 (Missing)
@@ -183,7 +183,7 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
+- name: Banned UHD Bluray
   score: -999999
 - name: Banned WEBRip
   score: -999999
diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml
index f9b99d0..8312aa9 100644
--- a/profiles/2160p Remux.yml	
+++ b/profiles/2160p Remux.yml	
@@ -7,77 +7,106 @@ description: '2160p Remux utilizes **Audio / Video Formats** to prioritise high
 
   - Fallbacks in Place for Proper Quality Progression
 
-  - 2160p Remux > 2160p WEB-DL > 1080p Remux > 1080p WEB-DL > 720p WEB-DL > 480p WEB-DL
-  > DVD'
+  - 2160p Remux > 2160p Bluray > 2160p WEB-DL > 1080p Remux > 1080p HDR Bluray > 1080p
+  Bluray > 1080p WEB-DL > 720p Bluray > 720p WEB-DL > 480p WEB-DL > DVD'
 tags:
-- 2160p
+- 1080p
 - Remux
 - HDR
 - Lossless Audio
 - h265
+- x265
 upgradesAllowed: true
 minCustomFormatScore: 20000
 upgradeUntilScore: 400000
 minScoreIncrement: 1
 custom_formats:
 - name: 2160p Remux
-  score: 160000
+  score: 320000
+- 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 Balanced Tier 1
+  score: 284000
+- name: 2160p Balanced Tier 2
+  score: 280000
 - name: 2160p WEB-DL
-  score: 140000
+  score: 280000
+- name: 2160p Quality Tier 6
+  score: 279000
 - name: 1080p Remux
-  score: 120000
+  score: 260000
+- name: UHD Bluray
+  score: 240000
+- name: UHD Bluray (Missing)
+  score: 240000
 - name: 1080p WEB-DL
-  score: 100000
+  score: 200000
+- name: 1080p Bluray
+  score: 140000
+- name: 1080p WEBRip
+  score: 140000
 - name: 720p WEB-DL
+  score: 100000
+- name: 1080p Quality Tier 1
+  score: 84000
+- name: 1080p Quality Tier 2
+  score: 83000
+- name: 1080p Quality Tier 3
+  score: 82000
+- name: 1080p Quality Tier 4
+  score: 81000
+- name: 1080p Quality Tier 5
   score: 80000
+- name: 720p Bluray
+  score: 80000
+- name: 720p WEBRip
+  score: 80000
+- name: 1080p Balanced Tier 1
+  score: 60000
 - name: 480p WEB-DL
   score: 60000
+- name: 720p Quality Tier 1
+  score: 44000
+- name: 720p Quality Tier 2
+  score: 43000
+- name: 720p Quality Tier 3
+  score: 42000
+- name: 720p Quality Tier 4
+  score: 41000
+- name: 720p Quality Tier 5
+  score: 40000
+- name: 720p Balanced Tier 1
+  score: 20000
 - name: DVD
   score: 20000
 - name: DVD Remux
   score: 20000
 - name: SD Quality Tier 1
   score: 11000
-- name: DTS-X
-  score: 10000
 - name: SD Quality Tier 2
   score: 10000
-- name: DTS-HD MA
-  score: 8000
-- name: TrueHD
-  score: 8000
-- name: TrueHD (Missing)
-  score: 8000
-- name: FLAC
-  score: 7000
-- name: PCM
-  score: 7000
-- name: DTS-HD HRA
-  score: 5000
-- name: Opus
-  score: 5000
-- name: Dolby Digital +
-  score: 4000
 - name: Dolby Vision
   score: 3000
-- name: DTS-ES
-  score: 3000
 - name: AMZN
   score: 2000
-- name: Atmos
-  score: 2000
-- name: Atmos (Missing)
-  score: 2000
-- name: Dolby Digital
-  score: 2000
 - name: HDR10+
   score: 2000
 - name: ATV
   score: 1000
-- name: DTS
+- name: DTS-X
   score: 1000
 - name: HDR
   score: 1000
+- name: HDR (Missing)
+  score: 1000
 - name: HDR10
   score: 1000
 - name: HDR10 (Missing)
@@ -88,22 +117,48 @@ custom_formats:
   score: 1000
 - name: PQ
   score: 1000
-- name: WEB-DL Tier 1
+- name: DTS-HD MA
+  score: 800
+- name: TrueHD
+  score: 800
+- name: TrueHD (Missing)
+  score: 800
+- name: FLAC
+  score: 700
+- name: PCM
+  score: 700
+- name: DTS-HD HRA
+  score: 500
+- name: Opus
+  score: 500
+- name: Dolby Digital +
+  score: 400
+- name: DTS-ES
+  score: 300
+- name: Atmos
+  score: 200
+- name: Atmos (Missing)
+  score: 200
+- name: Dolby Digital
+  score: 200
+- name: DTS
   score: 100
 - name: Remux Tier 1
+  score: 100
+- name: WEB-DL Tier 1
+  score: 100
+- name: Remux Tier 2
   score: 80
 - name: WEB-DL Tier 2
   score: 80
-- name: Remux Tier 2
+- name: Remux Tier 3
   score: 60
 - name: WEB-DL Tier 3
   score: 60
-- name: Remux Tier 3
+- name: Remux Tier 4
   score: 40
 - name: WEB-DL Tier 4
   score: 40
-- name: Remux Tier 4
-  score: 20
 - name: WEB-DL Tier 5
   score: 20
 - name: Repack3
@@ -132,6 +187,8 @@ custom_formats:
   score: 0
 - name: STAN
   score: 0
+- name: x265 (Bluray)
+  score: -220000
 - name: AV1
   score: -999999
 - name: B&W
@@ -142,7 +199,9 @@ custom_formats:
   score: -999999
 - name: Banned Remux
   score: -999999
-- name: Banned Scene
+- name: Banned UHD Bluray
+  score: -999999
+- name: Banned WEBRip
   score: -999999
 - name: Dolby Vision (Without Fallback)
   score: -999999
@@ -156,11 +215,19 @@ custom_formats:
   score: -999999
 - name: x264 (2160p)
   score: -999999
-- name: x265
+- name: x265 (Missing)
+  score: -999999
+- name: x265 (Remux)
+  score: -999999
+- name: x265 (WEB)
   score: -999999
 - name: Xvid
   score: -999999
 custom_formats_radarr:
+- name: 1080p Golden Popcorn
+  score: 8000
+- name: 720p Golden Popcorn
+  score: 6000
 - name: MA
   score: 6000
 - name: ATVP
@@ -169,6 +236,8 @@ custom_formats_radarr:
   score: 4000
 - name: iT
   score: 4000
+- name: SD Golden Popcorn
+  score: 4000
 - name: Amazon Enhancement
   score: 2000
 - name: HMAX
@@ -217,22 +286,49 @@ custom_formats_sonarr:
 qualities:
 - id: 3
   name: Remux-2160p
-- id: 5
-  name: WEBDL-2160p
+- id: -4
+  name: 2160p Transparent
+  description: ''
+  qualities:
+  - id: 4
+    name: Bluray-2160p
+  - id: 5
+    name: WEBDL-2160p
 - id: 8
   name: Remux-1080p
-- id: 9
-  name: WEBDL-1080p
-- id: 14
-  name: WEBDL-720p
 - id: -1
+  name: 1080p Transparent
+  description: All capable of being indistinguishable from source. WEB-DL included
+    to not allow unknown encode to trump known WEB-DL.
+  qualities:
+  - id: 10
+    name: Bluray-1080p
+  - id: 9
+    name: WEBDL-1080p
+  - id: 11
+    name: WEBRip-1080p
+- id: -2
+  name: 720p Transparent
+  description: Fallback to 720p when 1080p cannot be found.
+  qualities:
+  - id: 13
+    name: Bluray-720p
+  - id: 14
+    name: WEBDL-720p
+  - id: 15
+    name: WEBRip-720p
+- id: -3
   name: SD Fallback
   description: Standard Definition Fallbacks
   qualities:
-  - id: 22
-    name: DVD
+  - id: 18
+    name: Bluray-480p
   - id: 19
     name: WEBDL-480p
+  - id: 20
+    name: WEBRip-480p
+  - id: 22
+    name: DVD
 upgrade_until:
   id: 3
   name: Remux-2160p
diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml
index 4c797ef..aec585a 100644
--- a/profiles/720p Quality.yml	
+++ b/profiles/720p Quality.yml	
@@ -116,8 +116,6 @@ custom_formats:
   score: -999999
 - name: Banned Groups (Title)
   score: -999999
-- name: Banned Scene
-  score: -999999
 - name: Banned WEBRip
   score: -999999
 - name: Dolby Vision
diff --git a/regex_patterns/ATELiER.yml b/regex_patterns/ATELiER.yml
index 10388c4..a266ae4 100644
--- a/regex_patterns/ATELiER.yml
+++ b/regex_patterns/ATELiER.yml
@@ -1,6 +1,7 @@
-description: ''
 name: ATELiER
-pattern: ^(ATELiER)$
+pattern: (?<=^|[\s.-])ATELiER\b
+description: Matches "ATELiER" when preceded by whitespace, a hyphen or dot
 tags:
-- Radarr
+- Release Group
+- Bluray
 tests: []
diff --git a/regex_patterns/HDC.yml b/regex_patterns/HDC.yml
new file mode 100644
index 0000000..c7565c1
--- /dev/null
+++ b/regex_patterns/HDC.yml
@@ -0,0 +1,7 @@
+name: HDC
+pattern: (?<=^|[\s.-])HDC\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/TeamSyndicate.yml b/regex_patterns/TeamSyndicate.yml
new file mode 100644
index 0000000..ffc1083
--- /dev/null
+++ b/regex_patterns/TeamSyndicate.yml
@@ -0,0 +1,7 @@
+name: TeamSyndicate
+pattern: (?<=^|[\s.-])TeamSyndicate\b
+description: ''
+tags:
+- Release Group
+- Bluray
+tests: []
diff --git a/regex_patterns/UHD Bluray (Negation).yml b/regex_patterns/UHD Bluray (Negation).yml
deleted file mode 100644
index 43107ff..0000000
--- a/regex_patterns/UHD Bluray (Negation).yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-name: UHD Bluray (Negation)
-pattern: (?<=^|[\s.-])(D0ct0rLew|MALUS|MovieMan|SM737|SQS|WOU|Vialle)\b
-description: Match release groups who should not be categorized as UHD Bluray
-tags: []
-tests: []
diff --git a/regex_patterns/UHD Bluray Release Groups.yml b/regex_patterns/UHD Bluray Release Groups.yml
new file mode 100644
index 0000000..66aaa19
--- /dev/null
+++ b/regex_patterns/UHD Bluray Release Groups.yml	
@@ -0,0 +1,6 @@
+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
+description: Match release groups who should not be categorized as UHD Bluray
+tags: []
+tests: []
diff --git a/regex_patterns/WiKi.yml b/regex_patterns/WiKi.yml
index b549f47..bb8b74d 100644
--- a/regex_patterns/WiKi.yml
+++ b/regex_patterns/WiKi.yml
@@ -1,6 +1,6 @@
 name: WiKi
 pattern: (?<=^|[\s.-])WiKi\b
-description: Banned for Upscale
+description: ''
 tags:
 - Release Group
 - Bluray