diff --git a/after/syntax/css/css3-flexbox.vim b/after/syntax/css/css-flexbox-1.vim
similarity index 100%
rename from after/syntax/css/css3-flexbox.vim
rename to after/syntax/css/css-flexbox-1.vim
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 9679fbf..0e4f847 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -10,7 +10,6 @@ syn include @htmlCss syntax/css/css3-colors.vim
 " syn include @htmlCss syntax/css/css3-conditional.vim
 syn include @htmlCss syntax/css/css3-content.vim
 syn include @htmlCss syntax/css/css3-exclusions.vim
-syn include @htmlCss syntax/css/css3-flexbox.vim
 syn include @htmlCss syntax/css/css3-fonts.vim
 syn include @htmlCss syntax/css/css3-gcpm.vim
 syn include @htmlCss syntax/css/css3-hyperlinks.vim
@@ -33,6 +32,7 @@ syn include @htmlCss syntax/css/css3-ui.vim
 syn include @htmlCss syntax/css/css3-values.vim
 syn include @htmlCss syntax/css/css-counter-styles-3.vim
 syn include @htmlCss syntax/css/css-display-3.vim
+syn include @htmlCss syntax/css/css-flexbox-1.vim
 syn include @htmlCss syntax/css/css-grid-1.vim
 syn include @htmlCss syntax/css/css-lists-3.vim
 syn include @htmlCss syntax/css/css-masking-1.vim
diff --git a/test/test.css b/test/test.css
index 6a18591..d989cfb 100644
--- a/test/test.css
+++ b/test/test.css
@@ -121,14 +121,14 @@
 }
 
 .flexbox {
-  order: flex;
-  flex: row;
-  flex-basis: wrap;
-  flex-direction: inline-flex;
-  flex-flow: row-reverse;
-  flex-grow: column-reverse;
+  flex-direction: flex;
+  flex-wrap: inline-flex;
+  flex-flow: row;
+  order: row-reverse;
+  flex: column-reverse;
+  flex-grow: wrap;
   flex-shrink: wrap-reverse;
-  flex-wrap: auto;
+  flex-basis: auto;
 }
 
 .fonts {
diff --git a/test/test.html b/test/test.html
index 06a30a0..cfff555 100644
--- a/test/test.html
+++ b/test/test.html
@@ -131,14 +131,14 @@
       }
 
       .flexbox {
-        order: flex;
-        flex: row;
-        flex-basis: wrap;
-        flex-direction: inline-flex;
-        flex-flow: row-reverse;
-        flex-grow: column-reverse;
+        flex-direction: flex;
+        flex-wrap: inline-flex;
+        flex-flow: row;
+        order: row-reverse;
+        flex: column-reverse;
+        flex-grow: wrap;
         flex-shrink: wrap-reverse;
-        flex-wrap: auto;
+        flex-basis: auto;
       }
 
       .fonts {