diff --git a/after/syntax/css/html5-elements.vim b/after/syntax/css/html5-elements.vim
index 9c81c1d..88f054e 100644
--- a/after/syntax/css/html5-elements.vim
+++ b/after/syntax/css/html5-elements.vim
@@ -1,21 +1,22 @@
 " HTML5 new elements
-" Scripting
-syn keyword cssTagName template
 
 " Sections
-syn keyword cssTagName article section nav aside hgroup header footer
+syn keyword cssTagName article section nav aside header footer
 
 " Grouping content
 syn keyword cssTagName figure figcaption main
 
 " Text-level semantics
-syn keyword cssTagName data time mark ruby rt rp bdi wbr
+syn keyword cssTagName data time mark ruby rb rt rtc rp bdi wbr
 
 " Embedded content
-syn keyword cssTagName embed video audio source track canvas
+syn keyword cssTagName embed video audio source track
 
 " Forms
 syn keyword cssTagName datalist keygen output progress meter
 
 " Interactive elements
-syn keyword cssTagName details summary menuitem dialog
+syn keyword cssTagName details summary dialog
+
+" Scripting
+syn keyword cssTagName template canvas
diff --git a/test/test.css b/test/test.css
index 9d79204..a928e9c 100644
--- a/test/test.css
+++ b/test/test.css
@@ -530,12 +530,10 @@
 }
 
 .html5-elements,
-template,
 article,
 section,
 nav,
 aside,
-hgroup,
 header,
 footer,
 figure,
@@ -545,7 +543,9 @@ data,
 time,
 mark,
 ruby,
+rb,
 rt,
+rtc,
 rp,
 bdi,
 wbr,
@@ -554,7 +554,6 @@ video,
 audio,
 source,
 track,
-canvas,
 datalist,
 keygen,
 output,
@@ -562,7 +561,8 @@ progress,
 meter,
 details,
 summary,
-menuitem,
-dialog {
+dialog,
+template,
+canvas {
   display: auto;
 }
diff --git a/test/test.html b/test/test.html
index 51e5317..1f45cf3 100644
--- a/test/test.html
+++ b/test/test.html
@@ -540,12 +540,10 @@
       }
 
       .html5-elements,
-      template,
       article,
       section,
       nav,
       aside,
-      hgroup,
       header,
       footer,
       figure,
@@ -555,7 +553,9 @@
       time,
       mark,
       ruby,
+      rb,
       rt,
+      rtc,
       rp,
       bdi,
       wbr,
@@ -564,7 +564,6 @@
       audio,
       source,
       track,
-      canvas,
       datalist,
       keygen,
       output,
@@ -572,8 +571,9 @@
       meter,
       details,
       summary,
-      menuitem,
-      dialog {
+      dialog,
+      template,
+      canvas {
         display: auto;
       }
     </style>