diff --git a/after/syntax/css/css3-grid-layout.vim b/after/syntax/css/css3-grid-layout.vim
index c863c10..32ab622 100644
--- a/after/syntax/css/css3-grid-layout.vim
+++ b/after/syntax/css/css3-grid-layout.vim
@@ -1,4 +1,4 @@
 " TODO: create cssGridLayoutProp group and cssGridLayoutAttr group
-syn match cssFontProp contained "\<grid-\(cell\|\(column\|row\)\(-\(align\|sizing\|span\)\)\=\|columns\|flow\|rows\|template\)\>"
-syn keyword cssFontAttr contained grid rows
+syn match cssFontProp contained "\<grid-\(definition-\(rows\|columns\)\|template\|auto-\(rows\|columns\)\|before\|start\|after\|end\|column\|row\|area\|auto-flow\)\>"
+syn keyword cssFontAttr contained grid subgrid rows
 syn match cssFontAttr contained "\<inline-grid\>"
diff --git a/test/test.css b/test/test.css
index 59808e2..a6f909d 100644
--- a/test/test.css
+++ b/test/test.css
@@ -110,18 +110,18 @@
 }
 
 .grid-layout {
-  grid-cell: grid;
-  grid-column: rows;
-  grid-row: inline-grid;
-  grid-column-align: auto;
-  grid-row-align: auto;
-  grid-column-sizing: auto;
-  grid-row-sizing: auto;
-  grid-column-span: auto;
-  grid-row-span: auto;
-  grid-columns: auto;
-  grid-flow: auto;
-  grid-rows: auto;
+  grid-after: grid;
+  grid-area: subgrid;
+  grid-auto-columns: rows;
+  grid-auto-flow: inline-grid;
+  grid-auto-rows: auto;
+  grid-before: auto;
+  grid-column: auto;
+  grid-definition-columns: auto;
+  grid-definition-rows: auto;
+  grid-end: auto;
+  grid-row: auto;
+  grid-start: auto;
   grid-template: auto;
 }