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 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/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/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml
index b32b78a..40d34e8 100644
--- a/profiles/1080p Balanced+.yml	
+++ b/profiles/1080p Balanced+.yml	
@@ -168,12 +168,8 @@ custom_formats:
 - name: Xvid
   score: -999999
 custom_formats_radarr:
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Better Theatricals
   score: 1000
 - name: CRIT
diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml
index 984ce6a..0e2530d 100644
--- a/profiles/1080p Balanced.yml	
+++ b/profiles/1080p Balanced.yml	
@@ -160,12 +160,8 @@ custom_formats:
 - name: Xvid
   score: -999999
 custom_formats_radarr:
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Better Theatricals
   score: 1000
 - name: CRIT
diff --git a/profiles/1080p Efficient+.yml b/profiles/1080p Efficient+.yml
index 8746839..0814433 100644
--- a/profiles/1080p Efficient+.yml	
+++ b/profiles/1080p Efficient+.yml	
@@ -198,12 +198,8 @@ custom_formats_radarr:
   score: 161000
 - name: 1080p Efficient+ Movie WEB Tier 4
   score: 160000
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Better Theatricals
   score: 1000
 - name: CRIT
diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml
index c371eea..d580939 100644
--- a/profiles/1080p Efficient.yml	
+++ b/profiles/1080p Efficient.yml	
@@ -195,12 +195,8 @@ custom_formats_radarr:
   score: 161000
 - name: 1080p Efficient Movie WEB Tier 4
   score: 160000
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: AMZN
   score: 3000
 - name: Better Theatricals
@@ -228,8 +224,6 @@ custom_formats_sonarr:
   score: 184000
 - name: QxR Bluray
   score: 184000
-- name: TAoE Bluray
-  score: 184000
 - name: 1080p Efficient TV Bluray Tier 2
   score: 183000
 - name: 1080p Efficient TV Bluray Tier 3
diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml
index 3b2dc94..29762d4 100644
--- a/profiles/1080p Quality (HDR).yml	
+++ b/profiles/1080p Quality (HDR).yml	
@@ -182,14 +182,8 @@ custom_formats:
 - 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
diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml
index 313282f..3aa1262 100644
--- a/profiles/1080p Quality.yml	
+++ b/profiles/1080p Quality.yml	
@@ -169,14 +169,8 @@ custom_formats:
 - 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
diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml
index 8cd2789..f64916f 100644
--- a/profiles/1080p Remux.yml	
+++ b/profiles/1080p Remux.yml	
@@ -212,14 +212,8 @@ custom_formats:
 - 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
diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml
index 1c3aab9..253741f 100644
--- a/profiles/2160p Balanced.yml	
+++ b/profiles/2160p Balanced.yml	
@@ -180,10 +180,6 @@ custom_formats:
 - 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
@@ -192,8 +188,6 @@ custom_formats_radarr:
   score: 4000
 - name: iT
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Amazon Enhancement
   score: 2000
 - name: HMAX
diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml
index 3841b09..138dff5 100644
--- a/profiles/2160p Efficient.yml	
+++ b/profiles/2160p Efficient.yml	
@@ -197,8 +197,6 @@ custom_formats_radarr:
   score: 161000
 - name: 1080p Efficient+ Movie WEB Tier 4
   score: 160000
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
   score: 6000
 - name: ATVP
@@ -207,8 +205,6 @@ custom_formats_radarr:
   score: 4000
 - name: iT
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Amazon Enhancement
   score: 2000
 - name: HMAX
diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml
index 4cc0038..9b33a92 100644
--- a/profiles/2160p Quality.yml	
+++ b/profiles/2160p Quality.yml	
@@ -214,10 +214,6 @@ custom_formats:
 - 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
@@ -226,8 +222,6 @@ custom_formats_radarr:
   score: 4000
 - name: iT
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Amazon Enhancement
   score: 2000
 - name: HMAX
diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml
index a8c3924..902b874 100644
--- a/profiles/2160p Remux.yml	
+++ b/profiles/2160p Remux.yml	
@@ -230,10 +230,6 @@ custom_formats:
 - 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
@@ -242,8 +238,6 @@ custom_formats_radarr:
   score: 4000
 - name: iT
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Amazon Enhancement
   score: 2000
 - name: HMAX
diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml
index dc049f4..6707928 100644
--- a/profiles/720p Quality.yml	
+++ b/profiles/720p Quality.yml	
@@ -149,12 +149,8 @@ custom_formats:
 - name: Xvid
   score: -999999
 custom_formats_radarr:
-- name: 720p Golden Popcorn
-  score: 6000
 - name: MA
   score: 4000
-- name: SD Golden Popcorn
-  score: 4000
 - name: Better Theatricals
   score: 1000
 - name: CRIT
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/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/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/UHD Bluray Release Groups.yml b/regex_patterns/UHD Bluray Release Groups.yml
index 457bdfd..0d7ce03 100644
--- a/regex_patterns/UHD Bluray Release Groups.yml	
+++ b/regex_patterns/UHD Bluray Release Groups.yml	
@@ -1,5 +1,5 @@
 name: UHD Bluray Release Groups
-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|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
+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: []