diff --git a/Snippets/apply.sublime-snippet b/Snippets/blocks/apply.sublime-snippet
similarity index 58%
rename from Snippets/apply.sublime-snippet
rename to Snippets/blocks/apply.sublime-snippet
index 22c8095..309c499 100644
--- a/Snippets/apply.sublime-snippet
+++ b/Snippets/blocks/apply.sublime-snippet
@@ -1,10 +1,10 @@
 <snippet>
 <content><![CDATA[
-{% apply $1 %}
+{% apply ${1:filter} %}
 ${TM_TEMPLATE_INDENT}$0
 {% endapply %}
 ]]></content>
-<tabTrigger>apply</tabTrigger>
+<tabTrigger>bapply</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig apply</description>
+<description>Twig apply block</description>
 </snippet>
diff --git a/Snippets/autoescape.sublime-snippet b/Snippets/blocks/autoescape.sublime-snippet
similarity index 66%
rename from Snippets/autoescape.sublime-snippet
rename to Snippets/blocks/autoescape.sublime-snippet
index 5da6055..707aead 100644
--- a/Snippets/autoescape.sublime-snippet
+++ b/Snippets/blocks/autoescape.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endautoescape %}
 ]]></content>
-<tabTrigger>autoescape</tabTrigger>
+<tabTrigger>bautoescape</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig autoescape</description>
+<description>Twig autoescape block</description>
 </snippet>
diff --git a/Snippets/block.sublime-snippet b/Snippets/blocks/block.sublime-snippet
similarity index 69%
rename from Snippets/block.sublime-snippet
rename to Snippets/blocks/block.sublime-snippet
index a95be28..c7833db 100644
--- a/Snippets/block.sublime-snippet
+++ b/Snippets/blocks/block.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endblock %}
 ]]></content>
-<tabTrigger>block</tabTrigger>
+<tabTrigger>bblock</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig block</description>
+<description>Twig block block</description>
 </snippet>
diff --git a/Snippets/embed.sublime-snippet b/Snippets/blocks/embed.sublime-snippet
similarity index 69%
rename from Snippets/embed.sublime-snippet
rename to Snippets/blocks/embed.sublime-snippet
index 1430fd1..7cba739 100644
--- a/Snippets/embed.sublime-snippet
+++ b/Snippets/blocks/embed.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endembed %}
 ]]></content>
-<tabTrigger>embed</tabTrigger>
+<tabTrigger>bembed</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig embed</description>
+<description>Twig embed block</description>
 </snippet>
diff --git a/Snippets/for.sublime-snippet b/Snippets/blocks/for.sublime-snippet
similarity index 71%
rename from Snippets/for.sublime-snippet
rename to Snippets/blocks/for.sublime-snippet
index a614376..c8eafed 100644
--- a/Snippets/for.sublime-snippet
+++ b/Snippets/blocks/for.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endfor %}
 ]]></content>
-<tabTrigger>for</tabTrigger>
+<tabTrigger>bfor</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig for</description>
+<description>Twig for block</description>
 </snippet>
diff --git a/Snippets/blocks/guard.sublime-snippet b/Snippets/blocks/guard.sublime-snippet
new file mode 100644
index 0000000..ec992ee
--- /dev/null
+++ b/Snippets/blocks/guard.sublime-snippet
@@ -0,0 +1,10 @@
+<snippet>
+<content><![CDATA[
+{% guard ${1:type} ${2:callable} %}
+${TM_TEMPLATE_INDENT}$0
+{% endguard %}
+]]></content>
+<tabTrigger>bguard</tabTrigger>
+<scope>meta.template.twig - meta.guardded</scope>
+<description>Twig guard block</description>
+</snippet>
diff --git a/Snippets/if-else.sublime-snippet b/Snippets/blocks/if-else.sublime-snippet
similarity index 70%
rename from Snippets/if-else.sublime-snippet
rename to Snippets/blocks/if-else.sublime-snippet
index e73e0b9..a7240b2 100644
--- a/Snippets/if-else.sublime-snippet
+++ b/Snippets/blocks/if-else.sublime-snippet
@@ -6,7 +6,7 @@ ${TM_TEMPLATE_INDENT}$2
 ${TM_TEMPLATE_INDENT}$0
 {% endif %}
 ]]></content>
-<tabTrigger>elif</tabTrigger>
+<tabTrigger>bifelse</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig if-else</description>
+<description>Twig if-else block</description>
 </snippet>
diff --git a/Snippets/if.sublime-snippet b/Snippets/blocks/if.sublime-snippet
similarity index 68%
rename from Snippets/if.sublime-snippet
rename to Snippets/blocks/if.sublime-snippet
index b23d7c2..9845b8c 100644
--- a/Snippets/if.sublime-snippet
+++ b/Snippets/blocks/if.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endif %}
 ]]></content>
-<tabTrigger>if</tabTrigger>
+<tabTrigger>bif</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig if</description>
+<description>Twig if block</description>
 </snippet>
diff --git a/Snippets/macro.sublime-snippet b/Snippets/blocks/macro.sublime-snippet
similarity index 69%
rename from Snippets/macro.sublime-snippet
rename to Snippets/blocks/macro.sublime-snippet
index fa0c3c7..1b42242 100644
--- a/Snippets/macro.sublime-snippet
+++ b/Snippets/blocks/macro.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endmacro %}
 ]]></content>
-<tabTrigger>macro</tabTrigger>
+<tabTrigger>bmacro</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig macro</description>
+<description>Twig macro block</description>
 </snippet>
diff --git a/Snippets/sandbox.sublime-snippet b/Snippets/blocks/sandbox.sublime-snippet
similarity index 60%
rename from Snippets/sandbox.sublime-snippet
rename to Snippets/blocks/sandbox.sublime-snippet
index 68e6afe..fd5317e 100644
--- a/Snippets/sandbox.sublime-snippet
+++ b/Snippets/blocks/sandbox.sublime-snippet
@@ -1,10 +1,10 @@
 <snippet>
 <content><![CDATA[
-{% sandbox $1 %}
+{% sandbox %}
 ${TM_TEMPLATE_INDENT}$0
 {% endsandbox %}
 ]]></content>
-<tabTrigger>sandbox</tabTrigger>
+<tabTrigger>bsandbox</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig sandbox</description>
+<description>Twig sandbox block</description>
 </snippet>
diff --git a/Snippets/verbatim.sublime-snippet b/Snippets/blocks/verbatim.sublime-snippet
similarity index 66%
rename from Snippets/verbatim.sublime-snippet
rename to Snippets/blocks/verbatim.sublime-snippet
index 09a95bf..4072e16 100644
--- a/Snippets/verbatim.sublime-snippet
+++ b/Snippets/blocks/verbatim.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endverbatim %}
 ]]></content>
-<tabTrigger>verbatim</tabTrigger>
+<tabTrigger>bverbatim</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig verbatim</description>
+<description>Twig verbatim block</description>
 </snippet>
diff --git a/Snippets/with.sublime-snippet b/Snippets/blocks/with.sublime-snippet
similarity index 67%
rename from Snippets/with.sublime-snippet
rename to Snippets/blocks/with.sublime-snippet
index 3a884fc..92a5319 100644
--- a/Snippets/with.sublime-snippet
+++ b/Snippets/blocks/with.sublime-snippet
@@ -4,7 +4,7 @@
 ${TM_TEMPLATE_INDENT}$0
 {% endwith %}
 ]]></content>
-<tabTrigger>with</tabTrigger>
+<tabTrigger>bwith</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
-<description>Twig with</description>
+<description>Twig with block</description>
 </snippet>
diff --git a/Snippets/else.sublime-snippet b/Snippets/else.sublime-snippet
deleted file mode 100644
index 381311e..0000000
--- a/Snippets/else.sublime-snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-<snippet>
-<content><![CDATA[
-{% else %}
-${TM_TEMPLATE_INDENT}$0
-]]></content>
-<tabTrigger>else</tabTrigger>
-<scope>meta.template.twig - meta.embedded</scope>
-<description>Twig else</description>
-</snippet>
diff --git a/Snippets/elseif.sublime-snippet b/Snippets/elseif.sublime-snippet
deleted file mode 100644
index 961f4a2..0000000
--- a/Snippets/elseif.sublime-snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-<snippet>
-<content><![CDATA[
-{% elseif $1 %}
-${TM_TEMPLATE_INDENT}$0
-]]></content>
-<tabTrigger>elseif</tabTrigger>
-<scope>meta.template.twig - meta.embedded</scope>
-<description>Twig elseif</description>
-</snippet>
diff --git a/Snippets/dump.sublime-snippet b/Snippets/expressions/dump.sublime-snippet
similarity index 100%
rename from Snippets/dump.sublime-snippet
rename to Snippets/expressions/dump.sublime-snippet
diff --git a/Snippets/include.sublime-snippet b/Snippets/expressions/include.sublime-snippet
similarity index 100%
rename from Snippets/include.sublime-snippet
rename to Snippets/expressions/include.sublime-snippet
diff --git a/Snippets/extends.sublime-snippet b/Snippets/extends.sublime-snippet
deleted file mode 100644
index af0451d..0000000
--- a/Snippets/extends.sublime-snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-<snippet>
-<content><![CDATA[
-{% extends $1 %}
-]]></content>
-<tabTrigger>extends</tabTrigger>
-<scope>meta.template.twig - meta.embedded</scope>
-<description>Twig extends</description>
-</snippet>
diff --git a/Snippets/tags/apply.sublime-snippet b/Snippets/tags/apply.sublime-snippet
new file mode 100644
index 0000000..c4fc321
--- /dev/null
+++ b/Snippets/tags/apply.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% apply ${1:filter} %}]]></content>
+	<tabTrigger>apply</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig apply tag</description>
+</snippet>
diff --git a/Snippets/tags/autoescape.sublime-snippet b/Snippets/tags/autoescape.sublime-snippet
new file mode 100644
index 0000000..a60e842
--- /dev/null
+++ b/Snippets/tags/autoescape.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% autoescape $1 %}]]></content>
+	<tabTrigger>autoescape</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig autoescape tag</description>
+</snippet>
diff --git a/Snippets/tags/block.sublime-snippet b/Snippets/tags/block.sublime-snippet
new file mode 100644
index 0000000..a61134d
--- /dev/null
+++ b/Snippets/tags/block.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% block ${1:block_name} %}]]></content>
+	<tabTrigger>block</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig block tag</description>
+</snippet>
diff --git a/Snippets/tags/cache.sublime-snippet b/Snippets/tags/cache.sublime-snippet
new file mode 100644
index 0000000..57b0d50
--- /dev/null
+++ b/Snippets/tags/cache.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% cache $1 %}]]></content>
+	<tabTrigger>cache</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig cache tag</description>
+</snippet>
diff --git a/Snippets/tags/deprecated.sublime-snippet b/Snippets/tags/deprecated.sublime-snippet
new file mode 100644
index 0000000..92bf1aa
--- /dev/null
+++ b/Snippets/tags/deprecated.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% deprecated $1 %}]]></content>
+	<tabTrigger>deprecated</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig deprecated tag</description>
+</snippet>
diff --git a/Snippets/tags/else.sublime-snippet b/Snippets/tags/else.sublime-snippet
new file mode 100644
index 0000000..21f2961
--- /dev/null
+++ b/Snippets/tags/else.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% else %}]]></content>
+	<tabTrigger>else</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig else tag</description>
+</snippet>
diff --git a/Snippets/tags/elseif.sublime-snippet b/Snippets/tags/elseif.sublime-snippet
new file mode 100644
index 0000000..a1bc9ca
--- /dev/null
+++ b/Snippets/tags/elseif.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% elseif ${1:condition} %}]]></content>
+	<tabTrigger>elseif</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig elseif tag</description>
+</snippet>
diff --git a/Snippets/tags/embed.sublime-snippet b/Snippets/tags/embed.sublime-snippet
new file mode 100644
index 0000000..6d370fc
--- /dev/null
+++ b/Snippets/tags/embed.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% embed ${1:template_name} %}]]></content>
+	<tabTrigger>embed</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig embed tag</description>
+</snippet>
diff --git a/Snippets/tags/endapply.sublime-snippet b/Snippets/tags/endapply.sublime-snippet
new file mode 100644
index 0000000..4aaad58
--- /dev/null
+++ b/Snippets/tags/endapply.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endapply %}]]></content>
+	<tabTrigger>endapply</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endapply tag</description>
+</snippet>
diff --git a/Snippets/tags/endautoescape.sublime-snippet b/Snippets/tags/endautoescape.sublime-snippet
new file mode 100644
index 0000000..a2568c9
--- /dev/null
+++ b/Snippets/tags/endautoescape.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endautoescape %}]]></content>
+	<tabTrigger>endautoescape</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endautoescape tag</description>
+</snippet>
diff --git a/Snippets/tags/endblock.sublime-snippet b/Snippets/tags/endblock.sublime-snippet
new file mode 100644
index 0000000..2802af3
--- /dev/null
+++ b/Snippets/tags/endblock.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endblock %}]]></content>
+	<tabTrigger>endblock</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endblock tag</description>
+</snippet>
diff --git a/Snippets/tags/endcache.sublime-snippet b/Snippets/tags/endcache.sublime-snippet
new file mode 100644
index 0000000..00c5fa9
--- /dev/null
+++ b/Snippets/tags/endcache.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endcache %}]]></content>
+	<tabTrigger>endcache</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endcache tag</description>
+</snippet>
diff --git a/Snippets/tags/endfor.sublime-snippet b/Snippets/tags/endfor.sublime-snippet
new file mode 100644
index 0000000..254ca16
--- /dev/null
+++ b/Snippets/tags/endfor.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endfor %}]]></content>
+	<tabTrigger>endfor</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endfor tag</description>
+</snippet>
diff --git a/Snippets/tags/endguard.sublime-snippet b/Snippets/tags/endguard.sublime-snippet
new file mode 100644
index 0000000..fd18a5f
--- /dev/null
+++ b/Snippets/tags/endguard.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endguard %}]]></content>
+	<tabTrigger>endguard</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endguard tag</description>
+</snippet>
diff --git a/Snippets/tags/endif.sublime-snippet b/Snippets/tags/endif.sublime-snippet
new file mode 100644
index 0000000..678a4e2
--- /dev/null
+++ b/Snippets/tags/endif.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+<content><![CDATA[{% endif %}]]></content>
+<tabTrigger>endif</tabTrigger>
+<scope>meta.template.twig - meta.embedded</scope>
+<description>Twig endif tag</description>
+</snippet>
diff --git a/Snippets/tags/endmacro.sublime-snippet b/Snippets/tags/endmacro.sublime-snippet
new file mode 100644
index 0000000..e1605ae
--- /dev/null
+++ b/Snippets/tags/endmacro.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endmacro %}]]></content>
+	<tabTrigger>endmacro</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endmacro tag</description>
+</snippet>
diff --git a/Snippets/tags/endsandbox.sublime-snippet b/Snippets/tags/endsandbox.sublime-snippet
new file mode 100644
index 0000000..5788c57
--- /dev/null
+++ b/Snippets/tags/endsandbox.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endsandbox %}]]></content>
+	<tabTrigger>endsandbox</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endsandbox tag</description>
+</snippet>
diff --git a/Snippets/tags/endverbatim.sublime-snippet b/Snippets/tags/endverbatim.sublime-snippet
new file mode 100644
index 0000000..1320c2c
--- /dev/null
+++ b/Snippets/tags/endverbatim.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endverbatim %}]]></content>
+	<tabTrigger>endverbatim</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endverbatim tag</description>
+</snippet>
diff --git a/Snippets/tags/endwith.sublime-snippet b/Snippets/tags/endwith.sublime-snippet
new file mode 100644
index 0000000..01d25ce
--- /dev/null
+++ b/Snippets/tags/endwith.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% endwith %}]]></content>
+	<tabTrigger>endwith</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig endwith tag</description>
+</snippet>
diff --git a/Snippets/tags/extends.sublime-snippet b/Snippets/tags/extends.sublime-snippet
new file mode 100644
index 0000000..3b76e9c
--- /dev/null
+++ b/Snippets/tags/extends.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% extends "${0:template}" %}]]></content>
+	<tabTrigger>extends</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig extends tag</description>
+</snippet>
diff --git a/Snippets/tags/flush.sublime-snippet b/Snippets/tags/flush.sublime-snippet
new file mode 100644
index 0000000..7439781
--- /dev/null
+++ b/Snippets/tags/flush.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% flush %}]]></content>
+	<tabTrigger>flush</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig flush tag</description>
+</snippet>
diff --git a/Snippets/tags/for.sublime-snippet b/Snippets/tags/for.sublime-snippet
new file mode 100644
index 0000000..b19d2ca
--- /dev/null
+++ b/Snippets/tags/for.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% for ${1:item} in ${2:sequence} %}]]></content>
+	<tabTrigger>for</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig for tag</description>
+</snippet>
diff --git a/Snippets/tags/from.sublime-snippet b/Snippets/tags/from.sublime-snippet
new file mode 100644
index 0000000..dd62752
--- /dev/null
+++ b/Snippets/tags/from.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% from ${1:template} import $0 %}]]></content>
+	<tabTrigger>from</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig from...import...</description>
+</snippet>
diff --git a/Snippets/tags/guard filter.sublime-snippet b/Snippets/tags/guard filter.sublime-snippet
new file mode 100644
index 0000000..6f095a1
--- /dev/null
+++ b/Snippets/tags/guard filter.sublime-snippet	
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% guard filter ${1:callable} %}]]></content>
+	<tabTrigger>guardfilter</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig guard tag</description>
+</snippet>
diff --git a/Snippets/tags/guard function.sublime-snippet b/Snippets/tags/guard function.sublime-snippet
new file mode 100644
index 0000000..0054045
--- /dev/null
+++ b/Snippets/tags/guard function.sublime-snippet	
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% guard function ${1:callable} %}]]></content>
+	<tabTrigger>guardfunction</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig guard tag</description>
+</snippet>
diff --git a/Snippets/tags/guard test.sublime-snippet b/Snippets/tags/guard test.sublime-snippet
new file mode 100644
index 0000000..e7e629e
--- /dev/null
+++ b/Snippets/tags/guard test.sublime-snippet	
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% guard test ${1:callable} %}]]></content>
+	<tabTrigger>guardtest</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig guard tag</description>
+</snippet>
diff --git a/Snippets/tags/guard.sublime-snippet b/Snippets/tags/guard.sublime-snippet
new file mode 100644
index 0000000..f2dde13
--- /dev/null
+++ b/Snippets/tags/guard.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% guard ${1:type} ${2:callable} %}]]></content>
+	<tabTrigger>guard</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig guard tag</description>
+</snippet>
diff --git a/Snippets/tags/if.sublime-snippet b/Snippets/tags/if.sublime-snippet
new file mode 100644
index 0000000..58b20e8
--- /dev/null
+++ b/Snippets/tags/if.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% if ${1:condition} %}]]></content>
+	<tabTrigger>if</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig if tag</description>
+</snippet>
diff --git a/Snippets/tags/import.sublime-snippet b/Snippets/tags/import.sublime-snippet
new file mode 100644
index 0000000..c5ff23a
--- /dev/null
+++ b/Snippets/tags/import.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% import ${0:template} %}]]></content>
+	<tabTrigger>import</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig import tag</description>
+</snippet>
diff --git a/Snippets/tags/macro.sublime-snippet b/Snippets/tags/macro.sublime-snippet
new file mode 100644
index 0000000..71f093c
--- /dev/null
+++ b/Snippets/tags/macro.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% macro ${1:function_name}() %}]]></content>
+	<tabTrigger>macro</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig macro tag</description>
+</snippet>
diff --git a/Snippets/tags/sandbox.sublime-snippet b/Snippets/tags/sandbox.sublime-snippet
new file mode 100644
index 0000000..4b45482
--- /dev/null
+++ b/Snippets/tags/sandbox.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% sandbox %}]]></content>
+	<tabTrigger>sandbox</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig sandbox tag</description>
+</snippet>
diff --git a/Snippets/set.sublime-snippet b/Snippets/tags/set.sublime-snippet
similarity index 66%
rename from Snippets/set.sublime-snippet
rename to Snippets/tags/set.sublime-snippet
index 82ea159..480db83 100644
--- a/Snippets/set.sublime-snippet
+++ b/Snippets/tags/set.sublime-snippet
@@ -1,7 +1,5 @@
 <snippet>
-<content><![CDATA[
-{% set ${1:variable} = ${2:value} %}
-]]></content>
+<content><![CDATA[{% set ${1:variable} = ${2:value} %}]]></content>
 <tabTrigger>set</tabTrigger>
 <scope>meta.template.twig - meta.embedded</scope>
 <description>Twig set</description>
diff --git a/Snippets/tags/with.sublime-snippet b/Snippets/tags/with.sublime-snippet
new file mode 100644
index 0000000..7e3f4f6
--- /dev/null
+++ b/Snippets/tags/with.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[{% with $1 %}]]></content>
+	<tabTrigger>with</tabTrigger>
+	<scope>meta.template.twig - meta.template.twig meta.embedded</scope>
+	<description>Twig with tag</description>
+</snippet>