diff --git a/CHANGELOG.md b/CHANGELOG.md
index d480fbd..406c653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Release Notes
+## 0.8.6
+`2022-06-28`
+- Add preliminary Terraform syntax support
+
 ## 0.8.5
 `2022-06-28`
 - Update comment doc color
diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json
index c9e9e6b..cbb4213 100644
--- a/themes/tokyo-night-color-theme.json
+++ b/themes/tokyo-night-color-theme.json
@@ -713,6 +713,7 @@
             "name": "Object Key",
             "scope": [
                 "meta.object-literal.key",
+                "entity.name.type",
                 "string.alias.graphql",
                 "string.unquoted.graphql",
                 "string.unquoted.alias.graphql",
@@ -780,6 +781,7 @@
             "name": "Function Definition",
             "scope": [
                 "entity.name.function",
+                "variable.other.enummember",
                 "meta.function-call",
                 "meta.function-call entity.name.function",
                 "variable.function",
@@ -820,6 +822,8 @@
             "scope": [
                 "meta.definition.variable variable.other.constant",
                 "meta.definition.variable variable.other.readwrite",
+                "variable.declaration.hcl variable.other.readwrite.hcl",
+                "meta.mapping.key.hcl variable.other.readwrite.hcl",
                 "variable.other.declaration"
             ],
             "settings": {
diff --git a/themes/tokyo-night-light-color-theme.json b/themes/tokyo-night-light-color-theme.json
index 97eea64..2b61e2b 100644
--- a/themes/tokyo-night-light-color-theme.json
+++ b/themes/tokyo-night-light-color-theme.json
@@ -734,6 +734,7 @@
             "name": "Object Key",
             "scope": [
                 "meta.object-literal.key",
+                "entity.name.type",
                 "string.alias.graphql",
                 "string.unquoted.graphql",
                 "string.unquoted.alias.graphql",
@@ -802,6 +803,7 @@
             "name": "Function Definition",
             "scope": [
                 "entity.name.function",
+                "variable.other.enummember",
                 "meta.function-call",
                 "meta.function-call entity.name.function",
                 "variable.function",
@@ -842,6 +844,8 @@
             "scope": [
                 "meta.definition.variable variable.other.constant",
                 "meta.definition.variable variable.other.readwrite",
+                "variable.declaration.hcl variable.other.readwrite.hcl",
+                "meta.mapping.key.hcl variable.other.readwrite.hcl",
                 "variable.other.declaration"
             ],
             "settings": {
diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json
index 2dcdd62..cf35830 100644
--- a/themes/tokyo-night-storm-color-theme.json
+++ b/themes/tokyo-night-storm-color-theme.json
@@ -712,6 +712,7 @@
             "name": "Object Key",
             "scope": [
                 "meta.object-literal.key",
+                "entity.name.type",
                 "string.alias.graphql",
                 "string.unquoted.graphql",
                 "string.unquoted.alias.graphql",
@@ -780,6 +781,7 @@
             "name": "Function Definition",
             "scope": [
                 "entity.name.function",
+                "variable.other.enummember",
                 "meta.function-call",
                 "meta.function-call entity.name.function",
                 "variable.function",
@@ -820,6 +822,8 @@
             "scope": [
                 "meta.definition.variable variable.other.constant",
                 "meta.definition.variable variable.other.readwrite",
+                "variable.declaration.hcl variable.other.readwrite.hcl",
+                "meta.mapping.key.hcl variable.other.readwrite.hcl",
                 "variable.other.declaration"
             ],
             "settings": {