diff --git a/snippets/html.snippets b/snippets/html.snippets
index cf527b5..ca6bbcf 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -138,76 +138,76 @@ snippet width
width="${1}"${2}
# Elements
snippet a
- ${2:$1}${3}
+ ${2:$1}
snippet a.
- ${3:$1}${4}
+ ${3:$1}
snippet a#
- ${3:$1}${4}
+ ${3:$1}
snippet a:ext
- ${2:$1}${3}
+ ${2:$1}
snippet a:mail
- ${3:email me}${4}
+ ${3:email me}
snippet abbr
- ${2}${3}
+ ${2}
snippet address
${1}
- ${2}
+
snippet area
- ${5}
+
snippet area+
area+${5}
snippet area:c
- ${4}
+
snippet area:d
- ${4}
+
snippet area:p
- ${4}
+
snippet area:r
- ${4}
+
snippet article
${1}
- ${2}
+
snippet article.
${2}
- ${3}
+
snippet article#
${2}
- ${3}
+
snippet aside
${2}
+
snippet aside.
${3}
+
snippet aside#
${3}
+
snippet audio
-
snippet b
- ${1}${2}
+ ${1}
snippet base
- ${3}
+
snippet bdi
- ${1}${2}
+ ${1}
snippet bdo
- ${2}${3}
+ ${2}
snippet bdo:l
- ${1}${3}
+ ${1}
snippet bdo:r
- ${1}${3}
+ ${1}
snippet blockquote
${1}
-
${2}
+
snippet body
${1}
@@ -215,25 +215,25 @@ snippet body
snippet br
${1}
snippet button
- ${3}
+
snippet button.
- ${4}
+
snippet button#
- ${4}
+
snippet button:s
- ${2}
+
snippet button:r
- ${2}
+
snippet canvas
${2}
+
snippet caption
- ${1}${2}
+ ${1}
snippet cite
- ${1}${2}
+ ${1}
snippet code
- ${1}
${2}
+ ${1}
snippet col
${1}
snippet col+
@@ -242,58 +242,58 @@ snippet col+
snippet colgroup
${1}
- ${2}
+
snippet colgroup+
col+${1}
snippet command
- ${3}
+
snippet command:c
- ${3}
+
snippet command:r
- ${4}
+
snippet datagrid
${1}
- ${2}
+
snippet datalist
${2}
+
snippet datatemplate
${1}
- ${2}
+
snippet dd
- ${1}${2}
+ ${1}
snippet dd.
- ${2}${3}
+ ${2}
snippet dd#
- ${2}${3}
+ ${2}
snippet del
- ${1}${2}
+ ${1}
snippet details
${1}
snippet dfn
- ${1}${2}
+ ${1}
snippet dialog
${2}
+
snippet div
${1}
-
${2}
+
snippet div.
${2}
-
${3}
+
snippet div#
${2}
-
${3}
+
snippet dl
${1}
@@ -315,29 +315,29 @@ snippet dl+
snippet dt
- ${1}
snippet dt.
- - ${2}
${3}
+ - ${2}
snippet dt#
- - ${2}
${3}
+ - ${2}
snippet dt+
- ${1}
- ${2}
dt+${3}
snippet em
- ${1}${2}
+ ${1}
snippet embed
-
snippet fieldset
${2}
+
snippet fieldset.
${3}
+
snippet fieldset#
${3}
+
snippet fieldset+
fieldset+${3}
snippet figcaption
- ${1}${2}
+ ${1}
snippet figure
- ${2}
+
snippet footer
${2}
+
snippet footer.
${3}
+
snippet form
${4}
+
snippet form.
${5}
+
snippet form#
${5}
+
snippet h1
- ${1}
${2}
+ ${1}
snippet h1.
- ${2}
${3}
+ ${2}
snippet h1#
- ${2}
${3}
+ ${2}
snippet h2
- ${1}
${2}
+ ${1}
snippet h2.
- ${2}
${3}
+ ${2}
snippet h2#
- ${2}
${3}
+ ${2}
snippet h3
- ${1}
${2}
+ ${1}
snippet h3.
- ${2}${3}
+ ${2}
snippet h3#
- ${2}${3}
+ ${2}
snippet h4
- ${1}
${2}
+ ${1}
snippet h4.
- ${2}
${3}
+ ${2}
snippet h4#
- ${2}
${3}
+ ${2}
snippet h5
- ${1}
${2}
+ ${1}
snippet h5.
- ${2}
${3}
+ ${2}
snippet h5#
- ${2}
${3}
+ ${2}
snippet h6
- ${1}
${2}
+ ${1}
snippet h6.
- ${2}
${3}
+ ${2}
snippet h6#
- ${2}
${3}
+ ${2}
snippet head
- ${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}${2}
+ ${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}
+ ${2}
snippet header
${2}
+
snippet header.
${3}
+
snippet header#
${3}
+
snippet hgroup
${1}
- ${2}
+
snippet hgroup.
${2}
snippet iframe.
@@ -507,13 +508,13 @@ snippet input:url
snippet input:week
${4}
snippet ins
- ${1}${2}
+ ${1}
snippet kbd
- ${1}${2}
+ ${1}
snippet keygen
- ${1}${2}
+ ${1}
snippet label
- ${3}
+
snippet label:i
${7}
@@ -523,18 +524,18 @@ snippet label:s
snippet legend
- ${2}
+
snippet legend+
- ${2}
+
snippet li
- ${1}${2}
+ ${1}
snippet li.
- ${2}${3}
+ ${2}
snippet li+
${1}
li+${2}
snippet lia
- ${1}${3}
+ ${1}
snippet lia+
${1}
lia+${3}
@@ -553,33 +554,33 @@ snippet link:touch
snippet map
${3}
+
snippet map.
${4}
+
snippet map#
${7}
snippet mark
- ${1}${2}
+ ${1}
snippet menu
${2}
+
snippet menu:c
${2}
+
snippet menu:t
${2}
+
snippet meta
${3}
snippet meta:compat
@@ -593,19 +594,19 @@ snippet meter
snippet nav
${2}
+
snippet nav.
${3}
+
snippet nav#
${3}
+
snippet noscript
${2}
+
snippet object