diff --git a/sass/themes/_obsolete.scss b/sass/themes/_obsolete.scss
index a8fa995b..942cd87e 100644
--- a/sass/themes/_obsolete.scss
+++ b/sass/themes/_obsolete.scss
@@ -104,36 +104,21 @@ Many, many attributes are obsolete in HTML5. You should care!
 ### Selector
 ```css
 [dropzone],
+[contextmenu],
+[onshow],
 a[charset], link[charset],
 a[coords],
 a[shape],
 a[methods], link[methods],
-a[name], embed[name], img[name], option[name],
+a[name], option[name], embed[name], img[name],
 a[rev], link[rev],
 a[urn], link[urn],
 form[accept],
-area[nohref],
-area[type],
-area[hreflang],
 head[profile],
 html[version],
-input[ismap],
-input[usemap],
-input[inputmode],
-iframe[longdesc], img[longdesc],
-img[lowsrc],
 link[target],
-meta[scheme],
-meta[http-equiv="content-language"],
-meta[http-equiv="content-type"],
-meta[http-equiv="set-cookie"],
-object[archive],
-object[classid],
-object[code],
-object[codebase],
-object[codetype],
-object[declare],
-object[standby],
+menu[type],
+menu[label],
 param[type],
 param[valuetype],
 script[language],
@@ -144,45 +129,77 @@ table[summary],
 td[axis], th[axis],
 td[scope],
 td[abbr],
-a[datasrc], applet[datasrc], button[datasrc], div[datasrc], frame[datasrc], iframe[datasrc], img[datasrc], input[datasrc], label[datasrc], legend[datasrc], marquee[datasrc], object[datasrc], option[datasrc], select[datasrc], span[datasrc], table[datasrc], textarea[datasrc],
-a[datafld], applet[datafld], button[datafld], div[datafld], fieldset[datafld], frame[datafld], iframe[datafld], img[datafld], input[datafld], label[datafld], legend[datafld], marquee[datafld], object[datafld], param[datafld], select[datafld], span[datafld], textarea[datafld],
-button[dataformatas], div[dataformatas], input[dataformatas], label[dataformatas], legend[dataformatas], marquee[dataformatas], object[dataformatas], option[dataformatas], select[dataformatas], span[dataformatas], table[dataformatas],
+a[datasrc], applet[datasrc], button[datasrc], div[datasrc], frame[datasrc], label[datasrc], legend[datasrc], marquee[datasrc], option[datasrc], span[datasrc], table[datasrc],
+a[datafld], applet[datafld], button[datafld], div[datafld], fieldset[datafld], frame[datafld], label[datafld], legend[datafld], marquee[datafld], param[datafld], span[datafld],
+button[dataformatas], div[dataformatas], label[dataformatas], legend[dataformatas], marquee[dataformatas], option[dataformatas], span[dataformatas], table[dataformatas],
 body[alink],
 body[bgcolor], table[bgcolor], td[bgcolor], th[bgcolor], tr[bgcolor],
 body[link],
-body[marginbottom],
-body[marginheight], iframe[marginheight],
-body[marginleft],
-body[marginright],
-body[margintop],
-body[marginwidth], iframe[marginwidth],
+body[bottommargin],
+body[leftmargin],
+body[rightmargin],
+body[topmargin],
+body[marginheight],
+body[marginwidth],
 body[text],
 body[vlink],
-br[clear],
 col[char], tbody[char], thead[char], tfoot[char], td[char], th[char], tr[char],
 col[charoff], tbody[charoff], thead[charoff], tfoot[charoff], td[charoff], th[charoff], tr[charoff],
 col[valign], tbody[valign], thead[valign], tfoot[valign], td[valign], th[valign], tr[valign],
-col[width], hr[width], pre[width], table[width], td[width], th[width],
+col[width], pre[width], table[width], td[width], th[width],
 dl[compact], ol[compact], ul[compact],
+h1[align], h2[align], h3[align], h4[align], h5[align], h6[align], caption[align], col[align], div[align], legend[align], p[align], table[align], tbody[align], thead[align], tfoot[align], td[align], th[align], tr[align],
+li[type], ul[type],
+table[cellpadding],
+table[cellspacing],
+table[frame],
+table[rules],
+td[height], th[height],
+td[nowrap], th[nowrap],
+body[background], table[background], thead[background], tbody[background], tfoot[background], tr[background], td[background], th[background],
+// Self-closing tags
+embed[name], img[name],
+area[nohref],
+area[type],
+area[hreflang],
+input[ismap],
+input[usemap],
+iframe[longdesc], img[longdesc],
+img[lowsrc],
+object[archive],
+object[classid],
+object[code],
+object[codebase],
+object[codetype],
+object[declare],
+object[standby],
+object[typemustmatch],
+iframe[datasrc], img[datasrc], input[datasrc],object[datasrc], select[datasrc], textarea[datasrc],
+iframe[datafld], img[datafld], input[datafld], object[datafld], select[datafld], textarea[datafld],
+input[dataformatas], object[dataformatas], select[dataformatas],
+iframe[marginheight],
+iframe[marginwidth],
+br[clear],
+hr[width],
 embed[hspace], iframe[hspace], input[hspace], img[hspace], object[hspace],
 embed[vspace], iframe[vspace], input[vspace], img[vspace], object[vspace],
 hr[color],
 hr[noshade],
 hr[size],
-h1[align], h2[align], h3[align], h4[align], h5[align], h6[align], iframe[align], caption[align], col[align], div[align], embed[align], hr[align], input[align], img[align], legend[align], object[align], p[align], table[align], tbody[align], thead[align], tfoot[align], td[align], th[align], tr[align],
+iframe[align], embed[align], hr[align], input[align], img[align], object[align],
 iframe[allowtransparency],
 iframe[frameborder],
 iframe[framespacing],
 iframe[scrolling],
 img[border], object[border],
-li[type], ul[type],
-table[cellpadding],
-table[cellspacing],
-table[frame],
-table[rules],
-td[height], th[height],
-td[nowrap], th[nowrap],
-body[background], table[background], thead[background], tbody[background], tfoot[background], tr[background], td[background], th[background]
+// Tags in head
+link[charset], link[methods],
+link[rev], link[urn],
+link[target],
+meta[scheme],
+script[language],
+script[event],
+script[for]
 ```
 
 ### Test
@@ -191,6 +208,8 @@ body[background], table[background], thead[background], tbody[background], tfoot
 ```
 */
 [dropzone],
+[contextmenu],
+[onshow],
 a[charset], link[charset],
 a[coords],
 a[shape],
@@ -202,6 +221,8 @@ form[accept],
 head[profile],
 html[version],
 link[target],
+menu[type],
+menu[label],
 param[type],
 param[valuetype],
 script[language],
@@ -218,11 +239,11 @@ button[dataformatas], div[dataformatas], label[dataformatas], legend[dataformata
 body[alink],
 body[bgcolor], table[bgcolor], td[bgcolor], th[bgcolor], tr[bgcolor],
 body[link],
-body[marginbottom],
+body[bottommargin],
+body[leftmargin],
+body[rightmargin],
+body[topmargin],
 body[marginheight],
-body[marginleft],
-body[marginright],
-body[margintop],
 body[marginwidth],
 body[text],
 body[vlink],
@@ -258,6 +279,7 @@ object[codebase],
 object[codetype],
 object[declare],
 object[standby],
+object[typemustmatch],
 iframe[datasrc], img[datasrc], input[datasrc],object[datasrc], select[datasrc], textarea[datasrc],
 iframe[datafld], img[datafld], input[datafld], object[datafld], select[datafld], textarea[datafld],
 input[dataformatas], object[dataformatas], select[dataformatas],
@@ -275,8 +297,7 @@ iframe[allowtransparency],
 iframe[frameborder],
 iframe[framespacing],
 iframe[scrolling],
-img[border], object[border],
-input[inputmode] {
+img[border], object[border] {
   @include obsolete('attributes', $self-closing: true);
 }
 
@@ -284,9 +305,6 @@ link[charset], link[methods],
 link[rev], link[urn],
 link[target],
 meta[scheme],
-meta[http-equiv="content-language"],
-meta[http-equiv="content-type"],
-meta[http-equiv="set-cookie"],
 script[language],
 script[event],
 script[for] {