diff --git a/after/syntax/css/css-writing-modes-3.vim b/after/syntax/css/css-writing-modes-3.vim
index f129fa9..a2626e9 100644
--- a/after/syntax/css/css-writing-modes-3.vim
+++ b/after/syntax/css/css-writing-modes-3.vim
@@ -1,7 +1,8 @@
-" TODO: create cssWritingModesProp group and cssWritingModesAttr group
-syn match cssFontProp contained "\<text-\(orientation\|combine-horizontal\)\>"
 syn match cssFontProp contained "\<writing-mode\>"
-syn keyword cssFontAttr contained before after mixed isolate plaintext
-syn match cssFontAttr contained "\<\(upright\|sideways\(-right\|-left\)\=\|use-glyph-orientation\)\>"
-syn match cssFontAttr contained "\<isolate-override\>"
-syn match cssFontAttr contained "\<\(horizontal-tb\|vertical-\(rl\|lr\)\)\>"
+syn match cssFontProp contained "\<text-\(orientation\|combine-upright\)\>"
+syn match cssFontProp contained "\<glyph-orientation-vertical\>"
+syn keyword cssFontAttr contained before after mixed upright plaintext
+syn match cssFontAttr contained "\<sideways\(-rl\|-lr\)\=\>"
+syn match cssFontAttr contained "\<isolate\(-override\)\=\>"
+syn match cssFontAttr contained "\<horizontal-tb\>"
+syn match cssFontAttr contained "\<vertical-\(rl\|lr\)\>"
diff --git a/test/test.css b/test/test.css
index 1ee56f5..8a45cd8 100644
--- a/test/test.css
+++ b/test/test.css
@@ -623,17 +623,16 @@
 }
 
 .writing-modes {
-  text-orientation: before;
-  text-combine-horizontal: after;
-  writing-mode: isolate;
-  display: isolate;
+  writing-mode: before;
+  text-orientation: after;
+  text-combine-upright: mixed;
+  glyph-orientation-vertical: upright;
   display: plaintext;
-  display: mixed;
-  display: upright;
   display: sideways;
-  display: sideways-right;
-  display: sideways-left;
-  display: use-glyph-orientation;
+  display: sideways-rl;
+  display: sideways-lr;
+  display: isolate;
+  display: isolate-override;
   display: horizontal-tb;
   display: vertical-rl;
   display: vertical-lr;
diff --git a/test/test.html b/test/test.html
index f11520e..173bfdb 100644
--- a/test/test.html
+++ b/test/test.html
@@ -682,17 +682,16 @@
 </style>
 <style>
 .writing-modes {
-  text-orientation: before;
-  text-combine-horizontal: after;
-  writing-mode: isolate;
-  display: isolate;
+  writing-mode: before;
+  text-orientation: after;
+  text-combine-upright: mixed;
+  glyph-orientation-vertical: upright;
   display: plaintext;
-  display: mixed;
-  display: upright;
   display: sideways;
-  display: sideways-right;
-  display: sideways-left;
-  display: use-glyph-orientation;
+  display: sideways-rl;
+  display: sideways-lr;
+  display: isolate;
+  display: isolate-override;
   display: horizontal-tb;
   display: vertical-rl;
   display: vertical-lr;