diff --git a/VERSION b/VERSION
index 5f5d000f..106ef08d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.18.0-develop51
+1.18.0-develop52
diff --git a/defaults/overlays/audio_codec.yml b/defaults/overlays/audio_codec.yml
index f7bc328e..221905c1 100644
--- a/defaults/overlays/audio_codec.yml
+++ b/defaults/overlays/audio_codec.yml
@@ -39,33 +39,33 @@ templates:
           - key: dtsx
             value: '(?i)\bdts[ ._-]?x\b'
           - key: plus_atmos
-            value: '(?i)^(?=.*\b(dd[p+])|(dolby digital plus)\B)(?=.*\batmos(\b|\d))'
+            value: '(?i)^(?=.*\b(dd[p+])|(dolby digital plus)\b)(?=.*\batmos(\b|\d))'
           - key: dolby_atmos
             value: '(?i)\batmos(\b|\d)'
           - key: truehd
             value: '(?i)\btrue[ ._-]?hd(\b|\d)'
           - key: ma
-            value: '(?i)\bdts[ ._-]?(ma|hd[ ._-]?ma|hd)'
+            value: '(?i)\bdts[ ._-]?(hd[ ._-])?(ma|xll|hd)(\b|\d)(?![ ._-]hra)'
           - key: flac
             value: '(?i)\bflac(\b|\d)'
           - key: pcm
             value: '(?i)\bl?pcm(\b|\d)'
           - key: hra
-            value: '(?i)\bdts[ ._-]?(hd)?[ ._-]?(hr|hi|hd|ra)'
+            value: '(?i)\bdts[ ._-]?(hd[ ._-])?(hr|hra|hi|ra)(\b|\d)'
           - key: plus
-            value: '(?i)\b(dd[p+])|(dolby digital plus)|(e[ ._-]?ac3)\B'
+            value: '(?i)\b(dd[p+])|(dolby digital plus)|(e[ ._-]?ac3)\b'
           - key: dtses
             value: '(?i)\bdts[ ._-]?es(\b|\d)'
           - key: dts
             value: '(?i)\bdts(\b|\d)'
           - key: digital
-            value: '(?i)\b(dd)|(ac3)|(dolby)'
+            value: '(?i)\b(dd)|(ac3)|(dolby)(\b|\d)'
           - key: aac
-            value: '(?i)\b(aac|stereo|2[ .]0)(\b|\d)'
+            value: '(?i)\b(aac|stereo|2\.0)\b'
           - key: mp3
             value: '(?i)\bmp3(\b|\d)'
           - key: opus
-            value: '(?i)\bOPUS(\b|\d)'
+            value: '(?i)\b(?<!-)OPUS(\b|\d)'
     ignore_blank_results: true
     plex_all: true
     filters:
diff --git a/defaults/overlays/video_format.yml b/defaults/overlays/video_format.yml
index 953474ec..f88e63eb 100644
--- a/defaults/overlays/video_format.yml
+++ b/defaults/overlays/video_format.yml
@@ -29,17 +29,17 @@ templates:
       regex:
         conditions:
           - key: remux
-            value: '(?i)\[Remux'
+            value: '(?i)\bremux\b'
           - key: bluray
-            value: '(?i)\[Blu[ ._-]?ray|\[BD|\[BR|\[HD[ ._-]?DVD'
+            value: '(?i)\b(blu[ ._-]?ray|bd|br|hd[ ._-]?dvd)\b'
           - key: web
-            value: '(?i)Web[ ._-]?(dl|rip)'
+            value: '(?i)web[ ._-]?(dl|rip)'
           - key: hdtv
-            value: '(?i)HD[ ._-]?TV'
+            value: '(?i)\bhd[ ._-]?tv\b'
           - key: dvd
-            value: '(?i)\[DVD'
+            value: '(?i)\bdbvd\b'
           - key: sdtv
-            value: '(?i)SD[ ._-]?TV'
+            value: '(?i)\bsd[ ._-]?tv\b'
     ignore_blank_results: true
     plex_all: true
     filters:
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
index 31562d95..3e122c46 100644
--- a/docs/_static/custom.css
+++ b/docs/_static/custom.css
@@ -124,11 +124,6 @@ ul .simple {
   font-size: 0.75em;
 }
 
-.container {
-  padding-right: 0px;
-  padding-left: 0px;
-}
-
 label {
   margin-bottom: 0px;
 }