diff --git a/grind-stone.sublime-syntax b/grind-stone.sublime-syntax
index d89054a..3fce7b9 100644
--- a/grind-stone.sublime-syntax
+++ b/grind-stone.sublime-syntax
@@ -57,7 +57,7 @@ contexts:
             - meta_scope: meta.stone.symbol.js
             - include: directive_args
 
-        - match: '(\s{0}|^)(\@)\b(asset|babel|block|break|coffee|continue|css|debug|dump|each|elseif|extends|for|foreach|forelse|hasSection|if|include|js|layout|less|push|sass|scss|script|set|stack|styl|style|stylus|unless|while)\b(?=(|\s*|)\()'
+        - match: '(\s{0}|^)(\@)\b(asset|babel|block|break|coffee|continue|css|debug|dump|each|elseif|extends|for|foreach|forelse|hasSection|hassection|hasStack|hasstack|if|include|js|layout|less|push|sass|scss|script|set|stack|styl|style|stylus|unless|unlesshasstack|unlessHasStack|while)\b(?=(|\s*|)\()'
           captures:
             0: punctuation.section.embedded.js
             2: keyword.control.flow.js
@@ -65,7 +65,7 @@ contexts:
           push:
             - include: directive_args
 
-        - match: '(\s{0}|^)(\@)\b(break|continue|else|empty|endblock|endcomponent|endfor|endforeach|endforelse|endif|endmacro|endpush|endsection|endslot|endspaceless|endunless|endwhile|parent|setup|show|spaceless|super)\b'
+        - match: '(\s{0}|^)(\@)\b(break|continue|else|empty|endblock|endcomponent|endfor|endforeach|endforelse|endif|endmacro|endpush|endsection|endhasstack|endslot|endspaceless|endunless|endunlesshasstack|endwhile|parent|setup|show|spaceless|super)\b'
           scope: custom.compiler.stone.js
           captures:
             0: punctuation.section.embedded.js