diff --git a/after/syntax/css/html5-elements.vim b/after/syntax/css/html5-elements.vim
index 2ff3d24..15689ba 100644
--- a/after/syntax/css/html5-elements.vim
+++ b/after/syntax/css/html5-elements.vim
@@ -1,2 +1,18 @@
 " HTML5 new elements
-syn keyword cssTagName section article aside hgroup header footer nav figure figcaption video audio source embed mark progress meter data time ruby rt rp bdi wbr canvas command details summary datalist keygen output
+" Sections
+syn keyword cssTagName article section nav aside hgroup header footer
+
+" Grouping content
+syn keyword cssTagName figure figcaption main
+
+" Text-level semantics
+syn keyword cssTagName data time mark ruby rt rp bdi wbr
+
+" Embedded content
+syn keyword cssTagName embed video audio source track canvas
+
+" Forms
+syn keyword cssTagName datalist keygen output progress meter
+
+" Interactive elements
+syn keyword cssTagName details summary menuitem dialog
diff --git a/test/test.css b/test/test.css
index a85e9bf..e55a744 100644
--- a/test/test.css
+++ b/test/test.css
@@ -533,35 +533,38 @@
 }
 
 .html5-elements,
-section,
 article,
+section,
+nav,
 aside,
 hgroup,
 header,
 footer,
-nav,
 figure,
 figcaption,
-video,
-audio,
-source,
-embed,
-mark,
-progress,
-meter,
+main,
 data,
 time,
+mark,
 ruby,
 rt,
 rp,
 bdi,
 wbr,
+embed,
+video,
+audio,
+source,
+track,
 canvas,
-command,
-details,
-summary,
 datalist,
 keygen,
-output {
+output,
+progress,
+meter,
+details,
+summary,
+menuitem,
+dialog {
   display: auto;
 }