diff --git a/after/syntax/css/html5-elements.vim b/after/syntax/css/html5-elements.vim
deleted file mode 100644
index 6ccfc9d..0000000
--- a/after/syntax/css/html5-elements.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" HTML5 new elements
-
-" Sections
-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 rb rt rtc rp bdi wbr
-
-" Embedded content
-syn keyword cssTagName embed video audio source track
-
-" Forms
-syn keyword cssTagName datalist keygen output progress meter
-
-" Scripting
-syn keyword cssTagName template canvas
diff --git a/after/syntax/css/html5.vim b/after/syntax/css/html5.vim
new file mode 100644
index 0000000..e266866
--- /dev/null
+++ b/after/syntax/css/html5.vim
@@ -0,0 +1 @@
+syn keyword cssTagName picture rb rtc template
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 1093d63..f331592 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -59,7 +59,7 @@ syn include @htmlCss syntax/css/cssom-1.vim
 syn include @htmlCss syntax/css/cssom-view-1.vim
 syn include @htmlCss syntax/css/filter-effects-1.vim
 syn include @htmlCss syntax/css/geometry-1.vim
-syn include @htmlCss syntax/css/html5-elements.vim
+syn include @htmlCss syntax/css/html5.vim
 syn include @htmlCss syntax/css/motion-1.vim
 syn include @htmlCss syntax/css/pointerevents.vim
 syn include @htmlCss syntax/css/selectors-nonelement-1.vim
diff --git a/test/test.css b/test/test.css
index b54a5aa..10f0e08 100644
--- a/test/test.css
+++ b/test/test.css
@@ -753,37 +753,10 @@
   display: vertical-lr;
 }
 
-.html5-elements,
-article,
-section,
-nav,
-aside,
-header,
-footer,
-figure,
-figcaption,
-main,
-data,
-time,
-mark,
-ruby,
+.html5,
+picture,
 rb,
-rt,
 rtc,
-rp,
-bdi,
-wbr,
-embed,
-video,
-audio,
-source,
-track,
-datalist,
-keygen,
-output,
-progress,
-meter,
-template,
-canvas {
+template {
   display: auto;
 }
diff --git a/test/test.html b/test/test.html
index 98bda2b..681e70a 100644
--- a/test/test.html
+++ b/test/test.html
@@ -829,38 +829,11 @@
 }
 </style>
 <style>
-.html5-elements,
-article,
-section,
-nav,
-aside,
-header,
-footer,
-figure,
-figcaption,
-main,
-data,
-time,
-mark,
-ruby,
+.html5,
+picture,
 rb,
-rt,
 rtc,
-rp,
-bdi,
-wbr,
-embed,
-video,
-audio,
-source,
-track,
-datalist,
-keygen,
-output,
-progress,
-meter,
-template,
-canvas {
+template {
   display: auto;
 }
 </style>