diff --git a/javascript/ext_styles.js b/javascript/ext_styles.js
index 7f26a9c..0401e9c 100644
--- a/javascript/ext_styles.js
+++ b/javascript/ext_styles.js
@@ -1,4 +1,4 @@
-const STYLE_REGEX = /(\$(\d*)\(?)[^$|\]\s]*\)?/;
+const STYLE_REGEX = /(\$(\d*)\(?)[^$|\[\],\s]*\)?/;
 const STYLE_TRIGGER = () => TAC_CFG.useStyleVars && tagword.match(STYLE_REGEX);
 
 var lastStyleVarIndex = "";
diff --git a/javascript/tagAutocomplete.js b/javascript/tagAutocomplete.js
index 5737cb5..78f9c0d 100644
--- a/javascript/tagAutocomplete.js
+++ b/javascript/tagAutocomplete.js
@@ -409,8 +409,8 @@ function isEnabled() {
 const WEIGHT_REGEX = /[([]([^()[\]:|]+)(?::(?:\d+(?:\.\d+)?|\.\d+))?[)\]]/g;
 const POINTY_REGEX = /<[^\s,<](?:[^\t\n\r,<>]*>|[^\t\n\r,> ]*)/g;
 const COMPLETED_WILDCARD_REGEX = /__[^\s,_][^\t\n\r,_]*[^\s,_]__[^\s,_]*/g;
-const STYLE_VAR_REGEX = /\$\(?[^$|\]\s]*\)?/g;
-const NORMAL_TAG_REGEX = /[^\s,|<>\]:]+_\([^\s,|<>\]:]*\)?|[^\s,|<>():\]]+|</g;
+const STYLE_VAR_REGEX = /\$\(?[^$|\[\],\s]*\)?/g;
+const NORMAL_TAG_REGEX = /[^\s,|<>\[\]:]+_\([^\s,|<>\[\]:]*\)?|[^\s,|<>():\[\]]+|</g;
 const RUBY_TAG_REGEX = /[\w\d<][\w\d' \-?!/$%]{2,}>?/g;
 const TAG_REGEX = new RegExp(`${POINTY_REGEX.source}|${COMPLETED_WILDCARD_REGEX.source}|${STYLE_VAR_REGEX.source}|${NORMAL_TAG_REGEX.source}`, "g");
 
diff --git a/scripts/tag_autocomplete_helper.py b/scripts/tag_autocomplete_helper.py
index d64d3cc..48ffb24 100644
--- a/scripts/tag_autocomplete_helper.py
+++ b/scripts/tag_autocomplete_helper.py
@@ -607,10 +607,17 @@ def on_ui_settings():
 script_callbacks.on_ui_settings(on_ui_settings)
 
 def get_style_mtime():
-    style_file = getattr(shared, "styles_filename", "styles.csv")
-    style_file = Path(FILE_DIR).joinpath(style_file)
-    if Path.exists(style_file):
-        return style_file.stat().st_mtime
+    try:
+        style_file = getattr(shared, "styles_filename", "styles.csv")
+        # Check in case a list is returned
+        if isinstance(style_file, list):
+            style_file = style_file[0]
+        
+        style_file = Path(FILE_DIR).joinpath(style_file)
+        if Path.exists(style_file):
+            return style_file.stat().st_mtime
+    except Exception:
+        return None
 
 last_style_mtime = get_style_mtime()