diff --git a/.gitignore b/.gitignore
index 49fa97c..16cffdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.vsix
 *.DS_store
+node_modules/
+out/
diff --git a/syntaxes/constants.tmLanguage.json b/syntaxes/constants.tmLanguage.json
index 606c53e..3d90dcb 100644
--- a/syntaxes/constants.tmLanguage.json
+++ b/syntaxes/constants.tmLanguage.json
@@ -22,13 +22,16 @@
             "patterns": [
                 {
                     "comment": "Constant declaration",
-                    "match": "(\\^.+)\\s*=\\s*(.+)",
+                    "match": "^(\\^.+?)\\s*=\\s*(.*?)(\\s*//.*)?$",
                     "captures": {
                         "1": {
                             "name": "variable.name.constants.key"
                         },
                         "2": {
                             "name": "constant.numeric.constants"
+                        },
+                        "3": {
+                            "name": "comment.line"
                         }
                     }
                 }
diff --git a/syntaxes/enumconfig.tmLanguage.json b/syntaxes/enumconfig.tmLanguage.json
index 44eaa2f..41a477a 100644
--- a/syntaxes/enumconfig.tmLanguage.json
+++ b/syntaxes/enumconfig.tmLanguage.json
@@ -88,7 +88,7 @@
                 },
                 {
                     "comment": "Enum values",
-                    "match": "^(val)=(.+),(.+)",
+                    "match": "^(val)=([^,]+)(?:,(.+))?",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.enumconfig.key"
diff --git a/syntaxes/huntconfig.tmLanguage.json b/syntaxes/huntconfig.tmLanguage.json
index 5390f85..7fa0c40 100644
--- a/syntaxes/huntconfig.tmLanguage.json
+++ b/syntaxes/huntconfig.tmLanguage.json
@@ -141,7 +141,7 @@
                 },
                 {
                     "comment": "Hunt find_newmode values",
-                    "match": "^(find_newmode)=(opplayer[1-5]|applayer[1-5]|queue[1-20])?",
+                    "match": "^(find_newmode)=(opplayer[1-5]|applayer[1-5]|queue([1-9]|1[0-9]|20))?",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.huntconfig.key"
@@ -174,6 +174,18 @@
                             "name": "variable.language.huntconfig"
                         }
                     }
+                },
+                {
+                    "comment": "Hunt check_category values",
+                    "match": "^(check_category)=(.+)",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.huntconfig.key"
+                        },
+                        "2": {
+                            "name": "variable.language.huntconfig"
+                        }
+                    }
                 }
             ]
         }
diff --git a/syntaxes/interface.tmLanguage.json b/syntaxes/interface.tmLanguage.json
index 10c83f4..5566f6f 100644
--- a/syntaxes/interface.tmLanguage.json
+++ b/syntaxes/interface.tmLanguage.json
@@ -81,7 +81,7 @@
                 },
                 {
                     "comment": "Interface type values",
-                    "match": "^(type)=(layer|inv|rect|text|graphic|model|invtext)?",
+                    "match": "^(type)=(invtext|layer|inv|rect|text|graphic|model)?",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.interface.key"
@@ -117,7 +117,7 @@
                 },
                 {
                     "comment": "Interface font values",
-                    "match": "^(font)=(p11_full|p12_full|b12_full|q8_full)?",
+                    "match": "^(font)=(p11_full|p11|p12_full|p12|b12_full|b12|q8_full|q8)?",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.interface.key"
@@ -144,7 +144,7 @@
                 },
                 {
                     "comment": "Interface script op values",
-                    "match": "^(script\\d+op\\d+)=(\\w+)$",
+                    "match": "^(script\\d+op\\d+)=(\\w+(?::\\w+)?)$",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.interface.key"
@@ -156,7 +156,7 @@
                 },
                 {
                     "comment": "Interface script op values 2",
-                    "match": "^(script\\d+op\\d+)=(\\w+),(\\w+)$",
+                    "match": "^(script\\d+op\\d+)=(\\w+(?::\\w+)?),(\\w+(?::\\w+)?)$",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.interface.key"
@@ -171,7 +171,7 @@
                 },
                 {
                     "comment": "Interface script op values 3",
-                    "match": "^(script\\d+op\\d+)=(\\w+),(\\w+),(\\w+)$",
+                    "match": "^(script\\d+op\\d+)=(\\w+(?::\\w+)?),(\\w+(?::\\w+)?),(\\w+(?::\\w+)?)$",
                     "captures": {
                         "1": {
                             "name": "entity.name.type.interface.key"
@@ -218,4 +218,4 @@
         }
     },
     "scopeName": "source.interface"
-}
\ No newline at end of file
+}
diff --git a/syntaxes/seqconfig.tmLanguage.json b/syntaxes/seqconfig.tmLanguage.json
index 1b80ec3..9f4a968 100644
--- a/syntaxes/seqconfig.tmLanguage.json
+++ b/syntaxes/seqconfig.tmLanguage.json
@@ -91,6 +91,30 @@
                         }
                     }
                 },
+                {
+                    "comment": "Sequence replaceheld values",
+                    "match": "^(righthand|lefthand)=(hide|\\w+)\\b",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.seqconfig.key"
+                        },
+                        "2": {
+                            "name": "constant.numeric.seqconfig.value"
+                        }
+                    }
+                },
+                {
+                    "comment": "Sequence replay values",
+                    "match": "^(replayoff|replaycount)=(\\d+)\\b",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.seqconfig.key"
+                        },
+                        "2": {
+                            "name": "constant.numeric.seqconfig.value"
+                        }
+                    }
+                },
                 {
                     "comment": "Sequence preanim_move values",
                     "match": "^(preanim_move)=(\\w+)\\b",