diff --git a/core/modules/views/config/schema/views.argument.schema.yml b/core/modules/views/config/schema/views.argument.schema.yml
index 46117e1..2d6729b 100644
--- a/core/modules/views/config/schema/views.argument.schema.yml
+++ b/core/modules/views/config/schema/views.argument.schema.yml
@@ -65,20 +65,3 @@ views.argument.string:
     require_value:
       type: boolean
       label: 'Do not display items with no value in summary'
-
-views.argument.summary_options.default_summary:
-  type: mapping
-  label: 'Summary options'
-  mapping:
-    base_path:
-      type: string
-      label: 'Base path'
-    count:
-      type: boolean
-      label: 'Display record count with link'
-    override:
-      type: boolean
-      label: 'Override number of items to display'
-    items_per_page:
-      type: integer
-      label: 'Items to display'
diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index 5b32f45..edb6f76 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -14,7 +14,7 @@ views_display:
       type: sequence
       label: 'Fields'
       sequence:
-        - type: views.field.[table]_[field]
+        - type: views.field.[plugin_id]
     pager:
       type: mapping
       label: 'Pager'
@@ -48,7 +48,7 @@ views_display:
       type: sequence
       label: 'No results behavior'
       sequence:
-        - type: views.empty.[id]
+        - type: views.area.[plugin_id]
     sorts:
       type: sequence
       label: 'Sorts'
@@ -63,7 +63,7 @@ views_display:
       type: sequence
       label: 'Filters'
       sequence:
-        - type: views.filter.[table]_[field]
+        - type: views.filter.[plugin_id]
     style:
       type: mapping
       label: 'Format'
@@ -116,7 +116,7 @@ views_display:
       type: sequence
       label: 'Relationships'
       sequence:
-        - type: views.relationship.[table]_[field]
+        - type: views.relationship.[plugin_id]
 
 views_sort:
   type: mapping
@@ -228,7 +228,7 @@ views_argument:
       type: boolean
       label: 'Skip default argument for view URL'
     summary_options:
-      type: views.argument.summary_options.[%parent.summary.format]
+      type: views.style.[%parent.summary.format]
       label: 'Summary options'
     summary:
       type: mapping
diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml
index b55b42f..d84feb2 100644
--- a/core/modules/views/config/schema/views.display.schema.yml
+++ b/core/modules/views/config/schema/views.display.schema.yml
@@ -61,6 +61,7 @@ views.display.block:
       type: text
       label: 'Block name'
     block_caching:
+      type: boolean
       label: 'Block caching'
 
 views.display.feed:
diff --git a/core/modules/views/config/schema/views.empty.schema.yml b/core/modules/views/config/schema/views.empty.schema.yml
deleted file mode 100644
index 2050a88..0000000
--- a/core/modules/views/config/schema/views.empty.schema.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Schema for the views empty plugins.
-
-views.empty.area_text_custom:
-  type: views.area.text_custom
-  label: 'Unfiltered text'
diff --git a/core/modules/views/config/schema/views.handler.schema.yml b/core/modules/views/config/schema/views.handler.schema.yml
deleted file mode 100644
index da77e8d..0000000
--- a/core/modules/views/config/schema/views.handler.schema.yml
+++ /dev/null
@@ -1 +0,0 @@
-# Schema for the views handler plugins.
diff --git a/core/modules/views/config/schema/views.row.schema.yml b/core/modules/views/config/schema/views.row.schema.yml
index 1f9097a..5aa9195 100644
--- a/core/modules/views/config/schema/views.row.schema.yml
+++ b/core/modules/views/config/schema/views.row.schema.yml
@@ -17,5 +17,5 @@ views.row.fields:
       type: string
       label: 'Separator'
     hide_empty:
-      type: string
+      type: boolean
       label: 'Hide empty'
diff --git a/core/modules/views/config/schema/views.style.schema.yml b/core/modules/views/config/schema/views.style.schema.yml
index 64be1cc..b8b8899 100644
--- a/core/modules/views/config/schema/views.style.schema.yml
+++ b/core/modules/views/config/schema/views.style.schema.yml
@@ -92,3 +92,21 @@ views.style.table:
     empty_table:
       type: boolean
       label: 'Show the empty text in the table'
+
+
+views.style.default_summary:
+  type: mapping
+  label: 'Summary options'
+  mapping:
+    base_path:
+      type: string
+      label: 'Base path'
+    count:
+      type: boolean
+      label: 'Display record count with link'
+    override:
+      type: boolean
+      label: 'Override number of items to display'
+    items_per_page:
+      type: integer
+      label: 'Items to display'