diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index 0e36d3b..3ef568a 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -1744,17 +1744,31 @@ let s:emmet_settings = {
 \        },
 \        'default_attributes': {
 \            'a': [{'href': ''}],
+\            'a:blank': [{'href': 'http://|'},{'target': '_blank'},{'rel': 'noopener noreferrer'}],
 \            'a:link': [{'href': 'http://|'}],
 \            'a:mail': [{'href': 'mailto:|'}],
+\            'a:tel': [{'href': 'tel:+|'}],
 \            'abbr': [{'title': ''}],
 \            'acronym': [{'title': ''}],
+\            'acr': [{'title': ''}],
 \            'base': [{'href': ''}],
 \            'bdo': [{'dir': ''}],
 \            'bdo:r': [{'dir': 'rtl'}],
 \            'bdo:l': [{'dir': 'ltr'}],
+\            'button:disabled': [{'disabled': 'disabled'}],
+\            'button:d': [{'disabled': 'disabled'}],
+\            'btn:d': [{'disabled': 'disabled'}],
+\            'button:submit': [{'type': 'submit'}],
+\            'button:s': [{'type': 'submit'}],
+\            'btn:s': [{'type': 'submit'}],
+\            'button:reset': [{'type': 'reset'}],
+\            'button:r': [{'type': 'reset'}],
+\            'btn:r': [{'type': 'reset'}],
 \            'del': [{'datetime': '${datetime}'}],
 \            'ins': [{'datetime': '${datetime}'}],
 \            'link:css': [{'rel': 'stylesheet'}, g:emmet_html5 ? {} : {'type': 'text/css'}, {'href': '|style.css'}, {'media': 'all'}],
+\            'link:manifest': [{'rel': 'manifest'},{'href': '|manifest.json'}],
+\            'link:mf': [{'rel': 'manifest'},{'href': '|manifest.json'}],
 \            'link:print': [{'rel': 'stylesheet'}, g:emmet_html5 ? {} : {'type': 'text/css'}, {'href': '|print.css'}, {'media': 'print'}],
 \            'link:import': [{'rel': 'import'}, {'href': '|.html'}],
 \            'link:im': [{'rel': 'import'}, {'href': '|.html'}],
@@ -1762,14 +1776,23 @@ let s:emmet_settings = {
 \            'link:touch': [{'rel': 'apple-touch-icon'}, {'href': '|favicon.png'}],
 \            'link:rss': [{'rel': 'alternate'}, {'type': 'application/rss+xml'}, {'title': 'RSS'}, {'href': '|rss.xml'}],
 \            'link:atom': [{'rel': 'alternate'}, {'type': 'application/atom+xml'}, {'title': 'Atom'}, {'href': 'atom.xml'}],
+\            'marquee': [{'behavior': ''},{'direction': ''}],
 \            'meta:utf': [{'http-equiv': 'Content-Type'}, {'content': 'text/html;charset=UTF-8'}],
 \            'meta:vp': [{'name': 'viewport'}, {'content': 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0'}],
 \            'meta:win': [{'http-equiv': 'Content-Type'}, {'content': 'text/html;charset=Win-1251'}],
 \            'meta:compat': [{'http-equiv': 'X-UA-Compatible'}, {'content': 'IE=7'}],
+\            'meta:desc': [{'name': 'description'},{'content': ''}],
+\            'meta:edge': [{'http-equiv': 'X-UA-Compatible'}, {'content': 'ie=edge'}],
+\            'meta:kw': [{'name': 'keywords'},{'content': ''}],
+\            'meta:redirect': [{'http-equiv': 'Content-Type'}, {'content': '0; url=http://example.com'}],
 \            'style': g:emmet_html5 ? [] : [{'type': 'text/css'}],
 \            'script': g:emmet_html5 ? [] : [{'type': 'text/javascript'}],
 \            'script:src': (g:emmet_html5 ? [] : [{'type': 'text/javascript'}]) + [{'src': ''}],
 \            'img': [{'src': ''}, {'alt': ''}],
+\            'img:srcset': [{'srcset': ''},{'src': ''}, {'alt': ''}],
+\            'img:s': [{'srcset': ''},{'src': ''}, {'alt': ''}],
+\            'img:sizes': [{'sizes': ''},{'srcset': ''},{'src': ''}, {'alt': ''}],
+\            'img:z': [{'sizes': ''},{'srcset': ''},{'src': ''}, {'alt': ''}],
 \            'iframe': [{'src': ''}, {'frameborder': '0'}],
 \            'embed': [{'src': ''}, {'type': ''}],
 \            'object': [{'data': ''}, {'type': ''}],
@@ -1781,6 +1804,10 @@ let s:emmet_settings = {
 \            'area:r': [{'shape': 'rect'}, {'coords': ''}, {'href': ''}, {'alt': ''}],
 \            'area:p': [{'shape': 'poly'}, {'coords': ''}, {'href': ''}, {'alt': ''}],
 \            'link': [{'rel': 'stylesheet'}, {'href': ''}],
+\            'fieldset:disabled': [{'disabled': 'disabled'}],
+\            'fieldset:d': [{'disabled': 'disabled'}],
+\            'fset:d': [{'disabled': 'disabled'}],
+\            'fst:disabled': [{'disabled': 'disabled'}],
 \            'form': [{'action': ''}],
 \            'form:get': [{'action': ''}, {'method': 'get'}],
 \            'form:post': [{'action': ''}, {'method': 'post'}],
@@ -1793,6 +1820,7 @@ let s:emmet_settings = {
 \            'input:t': [{'type': 'text'}, {'name': ''}, {'id': ''}],
 \            'input:search': [{'type': 'search'}, {'name': ''}, {'id': ''}],
 \            'input:email': [{'type': 'email'}, {'name': ''}, {'id': ''}],
+\            'input:tel': [{'type': 'tel'}, {'name': ''}, {'id': ''}],
 \            'input:url': [{'type': 'url'}, {'name': ''}, {'id': ''}],
 \            'input:password': [{'type': 'password'}, {'name': ''}, {'id': ''}],
 \            'input:p': [{'type': 'password'}, {'name': ''}, {'id': ''}],
@@ -1819,6 +1847,20 @@ let s:emmet_settings = {
 \            'input:button': [{'type': 'button'}, {'value': ''}],
 \            'input:b': [{'type': 'button'}, {'value': ''}],
 \            'select': [{'name': ''}, {'id': ''}],
+\            'select:disabled': [{'name': ''}, {'id': ''}, {'disabled': 'disabled'}],
+\            'source:media': [{'media': '(minwidth: )'},{'srcset': ''}],
+\            'source:m': [{'media': '(minwidth: )'},{'srcset': ''}],
+\            'source:media:type': [{'media': '(minwidth: )'},{'srcset': ''},{'type': 'image/'}],
+\            'source:media:sizes': [{'media': '(minwidth: )'},{'srcset': ''},{'sizes': ''}],
+\            'source:sizes:type': [{'sizes': ''},{'srcset': ''},{'type': 'image/'}],
+\            'source:src': [{'src': ''},{'type': ''}],
+\            'source:sc': [{'src': ''},{'type': ''}],
+\            'source:srcset': [{'srcset': ''}],
+\            'source:s': [{'srcset': ''}],
+\            'source:type': [{'srcset': ''},{'type': 'image/'}],
+\            'source:t': [{'srcset': ''},{'type': 'image/'}],
+\            'source:sizes': [{'sizes': ''},{'srcset': ''}],
+\            'source:z': [{'sizes': ''},{'srcset': ''}],
 \            'option': [{'value': ''}],
 \            'textarea': [{'name': ''}, {'id': ''}, {'cols': '30'}, {'rows': '10'}],
 \            'menu:context': [{'type': 'context'}],
@@ -1840,19 +1882,23 @@ let s:emmet_settings = {
 \            'html:*': 'html',
 \            'a:*': 'a',
 \            'menu:*': 'menu',
+\            'mn': 'main',
+\            'tem': 'template',
 \            'bq': 'blockquote',
 \            'acr': 'acronym',
 \            'fig': 'figure',
+\            'figc': 'figcaption',
 \            'ifr': 'iframe',
 \            'emb': 'embed',
 \            'obj': 'object',
-\            'src': 'source',
+\            'src:*': 'source',
 \            'cap': 'caption',
 \            'colg': 'colgroup',
 \            'fst': 'fieldset',
-\            'btn': 'button',
+\            'btn:': 'button',
 \            'optg': 'optgroup',
 \            'opt': 'option',
+\            'pic': 'picture',
 \            'tarea': 'textarea',
 \            'leg': 'legend',
 \            'sect': 'section',
@@ -1871,6 +1917,7 @@ let s:emmet_settings = {
 \            'out': 'output',
 \            'det': 'details',
 \            'cmd': 'command',
+\            'sum': 'summary',
 \        },
 \        'expandos': {
 \            'ol': 'ol>li',
@@ -1884,6 +1931,14 @@ let s:emmet_settings = {
 \            'select': 'select>option',
 \            'optgroup': 'optgroup>option',
 \            'optg': 'optgroup>option',
+\            'ri:dpr': 'img:s',
+\            'ri:d': 'img:s',
+\            'ri:viewport': 'img:z',
+\            'ri:vp': 'img:z',
+\            'ri:art': 'pic>source:m+img',
+\            'ri:a': 'pic>source:m+img',
+\            'ri:type': 'pic>source:t+img',
+\            'ri:t': 'pic>source:t+img',
 \        },
 \        'empty_elements': 'area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,keygen,command',
 \        'block_elements': 'address,applet,blockquote,button,center,dd,del,dir,div,dl,dt,fieldset,form,frameset,hr,iframe,ins,isindex,li,link,map,menu,noframes,noscript,object,ol,p,pre,script,table,tbody,td,tfoot,th,thead,tr,ul,h1,h2,h3,h4,h5,h6',