diff --git a/angel_vscode/package.json b/angel_vscode/package.json
index 38ded00e..e1399ade 100644
--- a/angel_vscode/package.json
+++ b/angel_vscode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angel-dart-vscode",
-  "displayName": "Angel Dart Support",
+  "displayName": "Angel",
   "description": "Snippets and IDE support for the Angel server framework within VSCode.",
   "version": "0.0.1",
   "repository": {
@@ -19,6 +19,9 @@
     "angel",
     "angel-dart",
     "dart",
+    "jael",
+    "template",
+    "templating",
     "flutter",
     "fuchsia"
   ],
@@ -56,6 +59,10 @@
       {
         "language": "dart",
         "path": "./snippets/angel.json"
+      },
+      {
+        "language": "jael",
+        "path": "./snippets/jael.json"
       }
     ]
   },
diff --git a/angel_vscode/snippets/jael.json b/angel_vscode/snippets/jael.json
new file mode 100644
index 00000000..e2204607
--- /dev/null
+++ b/angel_vscode/snippets/jael.json
@@ -0,0 +1,53 @@
+{
+  ".source.jael": {
+    "block": {
+      "prefix": "block",
+      "description": "Insert a named <block> tag.",
+      "body": ["<block name=\"$1\">", "   $2", "<block>"]
+    },
+    "comment": {
+      "prefix": "comment",
+      "description": "Insert a comment.",
+      "body": ["<!-- $1 -->"]
+    },
+    "declare": {
+      "prefix": "declare",
+      "description": "Insert a <declare> tag.",
+      "body": ["<declare $1=$2>", "   $3", "<declare>"]
+    },
+    "element": {
+      "prefix": "element",
+      "description": "Insert a custom <element> tag.",
+      "body": ["<element name=\"$1\">", "   $2", "<element>"]
+    },
+    "extend": {
+      "prefix": "extend",
+      "description": "Insert an <extend> tag.",
+      "body": ["<extend src=\"$1\">", "   $2", "<extend>"]
+    },
+    "for-each": {
+      "prefix": "for-each",
+      "description": "Insert a <for-each> tag.",
+      "body": ["<${1:div} for-each=$2 as=\"$3\">", "   $4", "<$1>"]
+    },
+    "include": {
+      "prefix": "include",
+      "description": "Insert an <include /> tag.",
+      "body": ["<include src=\"$1\"/>"]
+    },
+    "switch": {
+      "prefix": "switch",
+      "description": "Insert a <switch> tag.",
+      "body": [
+        "<switch value=$1>",
+        "   <case value=$2>",
+        "       $3",
+        "   </case>",
+        "   <default>",
+        "       $4",
+        "   </default>",
+        "<switch>"
+      ]
+    }
+  }
+}
diff --git a/angel_vscode/syntaxes/jael.json b/angel_vscode/syntaxes/jael.json
index 02856a68..f5e6b745 100644
--- a/angel_vscode/syntaxes/jael.json
+++ b/angel_vscode/syntaxes/jael.json
@@ -11,16 +11,16 @@
       "name": "punctuation.jael"
     },
     {
-      "begin": "{{-?",
+      "begin": "{{(?!-)",
       "end": "}}",
       "beginCaptures": {
         "0": {
-          "name": "comment.jael"
+          "name": "keyword.operator.jael"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "comment.jael"
+          "name": "keyword.operator.jael"
         }
       },
       "patterns": [{ "include": "#expressions" }, { "include": "#operators" }]