diff --git a/core/modules/views/config/schema/views.style.schema.yml b/core/modules/views/config/schema/views.style.schema.yml
index 15dae70..a845ec4 100644
--- a/core/modules/views/config/schema/views.style.schema.yml
+++ b/core/modules/views/config/schema/views.style.schema.yml
@@ -29,15 +29,30 @@ views.style.grid:
     columns:
       type:  integer
       label: 'Number of columns'
+    automatic_width:
+      type: boolean
+      label: 'Automatic width'
     alignment:
       type: string
       label: 'Alignment'
-    fill_single_line:
+    row_class:
+      type: string
+      label: 'Custom row classes'
+    default_row_class:
       type: boolean
-      label: 'Fill up single line'
-    summary:
+      label: 'Default views row classes'
+    row_class_special:
       type: string
-      label: 'Table summary'
+      label: 'First, last and zebra striping row classes'
+    col_class:
+      type: string
+      label: 'Custom column classes'
+    default_col_class:
+      type: boolean
+      label: 'Default views column classes'
+    col_class_special:
+      type: string
+      label: 'First, last and zebra striping column classes'

 views.style.table:
   type: views_style
diff --git a/core/modules/views/templates/views-view-grid.html.twig b/core/modules/views/templates/views-view-grid.html.twig
index 2194203..3492bb9 100644
--- a/core/modules/views/templates/views-view-grid.html.twig
+++ b/core/modules/views/templates/views-view-grid.html.twig
@@ -27,21 +27,21 @@
 {% endif %}
 <div{{ attributes }}>
 {% if options.alignment == 'horizontal' %}
-  {% for row_id, row in items %}
-  <div{{ row_attributes[row_id] }}>
-    {% for col_id, col in row %}
-    <div{{ col_attributes[row_id][col_id] }}>
-      {{ items[row_id][col_id] }}
+  {% for row_key, row in items %}
+  <div{{ row_attributes[row_key] }}>
+    {% for col_key, col in row %}
+    <div{{ col_attributes[row_key][col_key] }}>
+      {{ items[row_key][col_key] }}
     </div>
     {% endfor %}
   </div>
   {% endfor %}
 {% else %}
-  {% for col_id, column in items %}
-  <div{{ col_attributes[col_id] }}>
-    {% for row_id, row in column %}
-      <div{{ row_attributes[col_id][row_id] }}>
-        {{ items[col_id][row_id] }}
+  {% for col_key, column in items %}
+  <div{{ col_attributes[col_key] }}>
+    {% for row_key, row in column %}
+      <div{{ row_attributes[col_key][row_key] }}>
+        {{ items[col_key][row_key] }}
       </div>
     {% endfor %}
     </div>