diff --git a/after/syntax/css/css-break-3.vim b/after/syntax/css/css-break-3.vim
index 7954a69..e3ab359 100644
--- a/after/syntax/css/css-break-3.vim
+++ b/after/syntax/css/css-break-3.vim
@@ -1,2 +1,3 @@
 syn match cssFontProp contained "\<break-\(after\|before\|inside\)\>"
 syn match cssFontProp contained "\<box-decoration-break\>"
+syn match cssFontAttr contained "\<\(avoid-\)\=column\>"
diff --git a/after/syntax/css/css3-multicol.vim b/after/syntax/css/css-multicol-1.vim
similarity index 60%
rename from after/syntax/css/css3-multicol.vim
rename to after/syntax/css/css-multicol-1.vim
index 636aa6f..3088a8b 100644
--- a/after/syntax/css/css3-multicol.vim
+++ b/after/syntax/css/css-multicol-1.vim
@@ -1,4 +1,3 @@
 syn keyword cssFontProp contained columns
 syn match cssFontProp contained "\<column-\(count\|fill\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
-syn keyword cssFontAttr contained balance
-syn match cssFontAttr contained "\<\(avoid-\)\=column\>"
+syn match cssFontAttr contained "\<balance\(-all\)\=\>"
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 62897b2..6b428a1 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -22,6 +22,7 @@ syn include @htmlCss syntax/css/css-line-grid-1.vim
 syn include @htmlCss syntax/css/css-lists-3.vim
 syn include @htmlCss syntax/css/css-logical-1.vim
 syn include @htmlCss syntax/css/css-masking-1.vim
+syn include @htmlCss syntax/css/css-multicol-1.vim
 syn include @htmlCss syntax/css/css-overflow-3.vim
 syn include @htmlCss syntax/css/css-overflow-4.vim
 syn include @htmlCss syntax/css/css-page-floats-3.vim
@@ -58,7 +59,6 @@ syn include @htmlCss syntax/css/css3-color.vim
 syn include @htmlCss syntax/css/css3-conditional.vim
 syn include @htmlCss syntax/css/css3-exclusions.vim
 syn include @htmlCss syntax/css/css3-images.vim
-syn include @htmlCss syntax/css/css3-multicol.vim
 syn include @htmlCss syntax/css/css3-namespace.vim
 syn include @htmlCss syntax/css/css3-page.vim
 syn include @htmlCss syntax/css/css3-speech.vim
diff --git a/test/test.css b/test/test.css
index 17d841b..f9055c0 100644
--- a/test/test.css
+++ b/test/test.css
@@ -76,7 +76,7 @@
 }
 
 .break-3 {
-  break-after: auto;
+  break-after: avoid-column;
   break-before: auto;
   break-inside: auto;
   box-decoration-break: auto;
@@ -500,10 +500,10 @@
   offset: auto;
 }
 
-.multicol {
+.multicol-1 {
   columns: column;
   column-count: balance;
-  column-fill: avoid-column;
+  column-fill: balance-all;
   column-rule: auto;
   column-rule-color: auto;
   column-rule-style: auto;
diff --git a/test/test.html b/test/test.html
index 2eda18f..05c4582 100644
--- a/test/test.html
+++ b/test/test.html
@@ -91,7 +91,7 @@
 </style>
 <style>
 .break-3 {
-  break-after: auto;
+  break-after: avoid-column;
   break-before: auto;
   break-inside: auto;
   box-decoration-break: auto;
@@ -543,10 +543,10 @@
 }
 </style>
 <style>
-.multicol {
+.multicol-1 {
   columns: column;
   column-count: balance;
-  column-fill: avoid-column;
+  column-fill: balance-all;
   column-rule: auto;
   column-rule-color: auto;
   column-rule-style: auto;