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 e03553e..992456e 100644
--- a/javascript/tagAutocomplete.js
+++ b/javascript/tagAutocomplete.js
@@ -400,8 +400,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");