diff --git a/custom_formats/4K Remaster.yml b/custom_formats/4K Remaster.yml
index 5c4a96f..d99e65f 100644
--- a/custom_formats/4K Remaster.yml	
+++ b/custom_formats/4K Remaster.yml	
@@ -3,18 +3,18 @@ description: ''
 tags: []
 conditions:
 - name: Remaster
-  type: release_title
-  required: false
   negate: false
   pattern: Remaster
-- name: 4K
-  type: release_title
   required: false
+  type: release_title
+- name: 4K
   negate: false
   pattern: 4K
+  required: false
+  type: release_title
 - name: Not 4K Resolution
-  type: resolution
-  required: true
   negate: true
+  required: true
   resolution: 2160p
+  type: resolution
 tests: []
diff --git a/custom_formats/AAC.yml b/custom_formats/AAC.yml
new file mode 100644
index 0000000..f3d9694
--- /dev/null
+++ b/custom_formats/AAC.yml
@@ -0,0 +1,35 @@
+name: AAC
+description: ''
+tags: []
+conditions:
+- name: AAC
+  type: release_title
+  required: false
+  negate: false
+  pattern: AAC
+- name: Not DTS
+  type: release_title
+  required: true
+  negate: true
+  pattern: DTS
+- name: Not Dolby Digital Plus
+  type: release_title
+  required: true
+  negate: true
+  pattern: Dolby Digital Plus
+- name: Not Basic Dolby Digital
+  type: release_title
+  required: true
+  negate: true
+  pattern: Basic Dolby Digital
+- name: Not PCM
+  type: release_title
+  required: true
+  negate: true
+  pattern: PCM
+- name: Not FLAC
+  type: release_title
+  required: true
+  negate: true
+  pattern: FLAC
+tests: []
diff --git a/custom_formats/AMZN.yml b/custom_formats/AMZN.yml
new file mode 100644
index 0000000..1355a2a
--- /dev/null
+++ b/custom_formats/AMZN.yml
@@ -0,0 +1,20 @@
+name: AMZN
+description: ''
+tags: []
+conditions:
+- name: Amazon
+  type: release_title
+  required: true
+  negate: false
+  pattern: Amazon
+- name: WEBDL
+  type: source
+  required: false
+  negate: false
+  source: web_dl
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
+tests: []
diff --git a/custom_formats/ATMOS (Undefined).yml b/custom_formats/ATMOS (Undefined).yml
new file mode 100644
index 0000000..c8b5f7f
--- /dev/null
+++ b/custom_formats/ATMOS (Undefined).yml	
@@ -0,0 +1,50 @@
+name: ATMOS (Undefined)
+description: ''
+tags: []
+conditions:
+- name: ATMOS
+  type: release_title
+  required: true
+  negate: false
+  pattern: ATMOS
+- name: Not AAC
+  type: release_title
+  required: true
+  negate: true
+  pattern: AAC
+- name: Not Basic Dolby Digital
+  type: release_title
+  required: true
+  negate: true
+  pattern: Basic Dolby Digital
+- name: Not Dolby Digital Plus
+  type: release_title
+  required: true
+  negate: true
+  pattern: Dolby Digital Plus
+- name: Not DTS
+  type: release_title
+  required: true
+  negate: true
+  pattern: DTS
+- name: Not FLAC
+  type: release_title
+  required: true
+  negate: true
+  pattern: FLAC
+- name: Not PCM
+  type: release_title
+  required: true
+  negate: true
+  pattern: PCM
+- name: Not RlsGrp (Atmos Only)
+  type: release_title
+  required: true
+  negate: true
+  pattern: RlsGrp (Atmos Only)
+- name: Not TrueHD
+  type: release_title
+  required: true
+  negate: true
+  pattern: TrueHD
+tests: []
diff --git a/regex_patterns/AAC.yml b/regex_patterns/AAC.yml
new file mode 100644
index 0000000..61f1981
--- /dev/null
+++ b/regex_patterns/AAC.yml
@@ -0,0 +1,5 @@
+name: AAC
+pattern: \bAAC(\b|\d)
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/ATMOS.yml b/regex_patterns/ATMOS.yml
new file mode 100644
index 0000000..3bc0304
--- /dev/null
+++ b/regex_patterns/ATMOS.yml
@@ -0,0 +1,5 @@
+name: ATMOS
+pattern: \bATMOS(\b|\d)
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/Amazon.yml b/regex_patterns/Amazon.yml
new file mode 100644
index 0000000..fbd7957
--- /dev/null
+++ b/regex_patterns/Amazon.yml
@@ -0,0 +1,5 @@
+name: Amazon
+pattern: \b(amzn|amazon(hd)?)\b
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/Basic Dolby Digital.yml b/regex_patterns/Basic Dolby Digital.yml
new file mode 100644
index 0000000..a95ba4a
--- /dev/null
+++ b/regex_patterns/Basic Dolby Digital.yml	
@@ -0,0 +1,5 @@
+name: Basic Dolby Digital
+pattern: \bDD[^a-z+]|(?<!e-)\b(ac-?3)\b
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/DTS.yml b/regex_patterns/DTS.yml
new file mode 100644
index 0000000..4b18c1e
--- /dev/null
+++ b/regex_patterns/DTS.yml
@@ -0,0 +1,5 @@
+name: DTS
+pattern: \bDTS(\b|\d)
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/Dolby Digital Plus.yml b/regex_patterns/Dolby Digital Plus.yml
new file mode 100644
index 0000000..e12dc3d
--- /dev/null
+++ b/regex_patterns/Dolby Digital Plus.yml	
@@ -0,0 +1,5 @@
+name: Dolby Digital Plus
+pattern: \bDD[P+]|\b(e[-_. ]?ac-?3)\b
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/FLAC.yml b/regex_patterns/FLAC.yml
new file mode 100644
index 0000000..3c1c3da
--- /dev/null
+++ b/regex_patterns/FLAC.yml
@@ -0,0 +1,5 @@
+name: FLAC
+pattern: \bFLAC(\b|\d)
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/PCM.yml b/regex_patterns/PCM.yml
new file mode 100644
index 0000000..0340d00
--- /dev/null
+++ b/regex_patterns/PCM.yml
@@ -0,0 +1,5 @@
+name: PCM
+pattern: \b(l?)PCM(\b|\d)
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/RlsGrp (Atmos Only).yml b/regex_patterns/RlsGrp (Atmos Only).yml
new file mode 100644
index 0000000..e04e598
--- /dev/null
+++ b/regex_patterns/RlsGrp (Atmos Only).yml	
@@ -0,0 +1,5 @@
+name: RlsGrp (Atmos Only)
+pattern: \b(W4NK3R|HQMUX)\b
+description: ''
+tags: []
+tests: []
diff --git a/regex_patterns/TrueHD ATMOS.yml b/regex_patterns/TrueHD ATMOS.yml
deleted file mode 100644
index 78ecc99..0000000
--- a/regex_patterns/TrueHD ATMOS.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-name: TrueHD ATMOS
-pattern: True[ .-]?HD|W4NK3R|HQMUX
-description: Dolby Atmos is a surround sound technology developed by Dolby Laboratories.
-  It expands on existing surround sound systems by adding height channels, allowing
-  sounds to be interpreted as three-dimensional objects.
-tags: []
-tests: []
diff --git a/regex_patterns/TrueHD.yml b/regex_patterns/TrueHD.yml
new file mode 100644
index 0000000..f14a122
--- /dev/null
+++ b/regex_patterns/TrueHD.yml
@@ -0,0 +1,5 @@
+name: TrueHD
+pattern: True[ .-]?HD
+description: ''
+tags: []
+tests: []