diff --git a/grammars/blade.cson b/grammars/blade.cson
index a4ff428..771d9a0 100644
--- a/grammars/blade.cson
+++ b/grammars/blade.cson
@@ -11,22 +11,28 @@
     'patterns': [
       {
         'begin': '{{--'
-        'captures':
+        'beginCaptures':
           '0':
-            'name': 'punctuation.definition.comment.blade'
+            'name': 'punctuation.definition.comment.begin.blade'
         'end': '--}}'
-        'name': 'comment.block.meta.embedded.blade'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.comment.end.blade'
+        'name': 'comment.block.blade'
       }
       {
         'begin': '(?<!@){{{'
-        'captures':
+        'beginCaptures':
           '0':
-            'name': 'support.punctuation.blade'
-          '1':
-            'name': 'source.php'
+            'name': 'support.function.construct.begin.blade'
         'contentName': 'source.php'
         'end': '(})}}'
-        'name': 'meta.embedded.echo.blade'
+        'endCaptures':
+          '0':
+            'name': 'support.function.construct.end.blade'
+          '1':
+            'name': 'source.php'
+        'name': 'meta.function.echo.blade'
         'patterns': [
           {
             'include': '#language'
@@ -35,14 +41,17 @@
       }
       {
         'begin': '(?<![@{]){{'
-        'captures':
+        'beginCaptures':
           '0':
-            'name': 'support.punctuation.blade'
-          '1':
-            'name': 'source.php'
+            'name': 'support.function.construct.begin.blade'
         'contentName': 'source.php'
         'end': '(})}'
-        'name': 'meta.embedded.echo.blade'
+        'endCaptures':
+          '0':
+            'name': 'support.function.construct.end.blade'
+          '1':
+            'name': 'source.php'
+        'name': 'meta.function.echo.blade'
         'patterns': [
           {
             'include': '#language'
@@ -51,14 +60,17 @@
       }
       {
         'begin': '(?<!@){!!'
-        'captures':
+        'beginCaptures':
           '0':
-            'name': 'support.punctuation.blade'
-          '1':
-            'name': 'source.php'
+            'name': 'support.function.construct.begin.blade'
         'contentName': 'source.php'
         'end': '(!)!}'
-        'name': 'meta.embedded.echo.blade'
+        'endCaptures':
+          '0':
+            'name': 'support.function.construct.end.blade'
+          '1':
+            'name': 'source.php'
+        'name': 'meta.function.echo.blade'
         'patterns': [
           {
             'include': '#language'
@@ -66,13 +78,13 @@
         ]
       }
       {
-        'begin': '(?<![A-z0-9_@])@(break|c(hoice|ontinue)|each|hasSection|(else)?(if|can(not)?)|in(ject|clude(If)?)|extends|for(e(ach|lse))?|lang|p(hp|ush)|section|stack|un(less|set)|while|yield)\\s*(?=\\()'
+        'begin': '(?<![A-Za-z0-9_@])@(break|c(hoice|ontinue)|each|hasSection|(else)?(if|can(not)?)|in(ject|clude(If)?)|extends|for(e(ach|lse))?|lang|p(hp|ush)|section|stack|un(less|set)|while|yield)\\s*(?=\\()'
         'beginCaptures':
           '0':
             'name': 'keyword.blade'
         'contentName': 'source.php'
         'end': '(?<=\\))(?!.*\\))'
-        'name': 'meta.embedded.blade'
+        'name': 'meta.directive.blade'
         'patterns': [
           {
             'include': '#language'
@@ -80,17 +92,17 @@
         ]
       }
       {
-        'match': '(?<![A-z0-9_@])@(append|break|continue|empty|else|end(can(not)?|for(each|else)?|i(f|nject)|p(hp|ush)|section|unless|verbatim|while)|overwrite|s(how|top)|verbatim)\\b|(?<!@)@parent'
-        'name': 'meta.embedded.keyword.blade'
+        'match': '(?<![A-Za-z0-9_@])@(?:append|break|continue|empty|else|end(?:can|cannot|for|foreach|forelse|if|inject|php|push|section|unless|verbatim|while)|overwrite|show|stop|verbatim)\\b|(?<!@)@parent'
+        'name': 'keyword.blade'
       }
       {
-        'begin': '(?<![A-z0-9_@])@\\w+\\s*(?=\\()'
+        'begin': '(?<![A-Za-z0-9_@])@\\w+\\s*(?=\\()'
         'beginCaptures':
           '0':
-            'name': 'entity.blade'
+            'name': 'entity.name.function.blade'
         'contentName': 'source.php'
         'end': '(?<=\\))(?!.*\\))'
-        'name': 'meta.embedded.blade'
+        'name': 'meta.directive.custom.blade'
         'patterns': [
           {
             'include': '#language'
@@ -98,16 +110,16 @@
         ]
       }
       {
-        'begin': '(?<![A-z0-9_@])@php'
-        'end': '(?<![A-z0-9_@])@endphp'
+        'begin': '(?<![A-Za-z0-9_@])@php'
+        'end': '(?<![A-Za-z0-9_@])@endphp'
         'beginCaptures':
           '0':
-            'name': 'meta.embedded.keyword.blade'
+            'name': 'keyword.begin.blade'
         'endCaptures':
           '0':
-            'name': 'meta.embedded.keyword.blade'
+            'name': 'keyword.end.blade'
         'contentName': 'source.php'
-        'name': 'meta.embedded.blade'
+        'name': 'meta.embedded.block.blade'
         'patterns': [
           {
             'include': '#language'
@@ -115,8 +127,8 @@
         ]
       }
       {
-        'match': '(?<![A-z0-9_@])@(?!(choice|each|(else)?(if|can(not)?)|extends|for(e(ach|lse))?|hasSection|in(clude(If)?|ject)|lang|p(hp|ush)|section|stack|un(less|set)|while|yield)\\b)\\w+\\b'
-        'name': 'meta.embedded.entity.blade'
+        'match': '(?<![A-Za-z0-9_@])@(?!(choice|each|(else)?(if|can(not)?)|extends|for(e(ach|lse))?|hasSection|in(clude(If)?|ject)|lang|p(hp|ush)|section|stack|un(less|set)|while|yield)\\b)\\w+\\b'
+        'name': 'entity.name.function.blade'
       }
       {
         'begin': '(^\\s*)(?=<\\?(?![^?]*\\?>))'