diff --git a/core/modules/system/config/schema/system.data_types.schema.yml b/core/modules/system/config/schema/system.data_types.schema.yml
index 0cef603..dc5c1b4 100644
--- a/core/modules/system/config/schema/system.data_types.schema.yml
+++ b/core/modules/system/config/schema/system.data_types.schema.yml
@@ -69,7 +69,7 @@ date_format:
   mapping:
     name:
       type: string
-      label: 'Format name'
+      label: 'Name'
     pattern:
       type: mapping
       label: 'Patterns'
diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml
index 9419a59..b5d48f8 100644
--- a/core/modules/system/config/schema/system.schema.yml
+++ b/core/modules/system/config/schema/system.schema.yml
@@ -1,4 +1,5 @@
 # Schema for configuration files of system module.
+
 system.site:
   type: mapping
   label: 'Site information'
@@ -52,11 +53,11 @@ system.cron:
   mapping:
     threshold:
       type: mapping
-      label: 'Cron threshold settings'
+      label: 'Thresholds'
       mapping:
         autorun:
           type: integer
-          label: 'Autorun period'
+          label: 'Run cron every'
         requirements_warning:
           type: integer
           label: 'Requirements warning period'
@@ -70,7 +71,7 @@ system.date:
   mapping:
     first_day:
       type: integer
-      label: 'First day'
+      label: 'First day of week'
     country:
       type: mapping
       label: 'Country'
@@ -79,39 +80,11 @@ system.date:
           type: string
           label: 'Default country'
     formats:
-      type: mapping
+      type: sequence
       label: 'Date formats'
-      mapping:
-        long:
-          type: date_format
-          label: 'Long format'
-        medium:
-          type: date_format
-          label: 'Medium format'
-        short:
-          type: date_format
-          label: 'Short format'
-        html_datetime:
-          type: date_format
-          label: 'HTML datetime'
-        html_date:
-          type: date_format
-          label: 'HTML date'
-        html_time:
-          type: date_format
-          label: 'HTML time'
-        html_yearless_date:
-          type: date_format
-          label: 'HTML yearless date'
-        html_week:
-          type: date_format
-          label: 'HTML week'
-        html_month:
-          type: date_format
-          label: 'HTML month'
-        html_year:
-          type: date_format
-          label: 'HTML year'
+      sequence:
+        - type: date_format
+
 
 system.fast_404:
   type: mapping
@@ -119,16 +92,16 @@ system.fast_404:
   mapping:
     enabled:
       type: boolean
-      label: 'Fast 404 enabled'
+      label: 'Enabled'
     paths:
       type: string
-      label: 'Fast 404 paths'
+      label: 'Paths'
     exclude_paths:
       type: string
-      label: 'Fast 404 exclude paths'
+      label: 'Exclude paths'
     html:
       type: string
-      label: 'Fast 404 html'
+      label: 'HTML'
 
 system.filter:
   type: mapping
@@ -136,7 +109,10 @@ system.filter:
   mapping:
     protocols:
       type: sequence
-      label: 'Protocols'
+      label: 'Allowed protocols'
+      sequence:
+        - type: string
+          label: 'Protocal'
 
 system.logging:
   type: mapping
@@ -144,15 +120,18 @@ system.logging:
   mapping:
     error_level:
       type: string
-      label: 'Error level'
+      label: 'Error messages to display'
 
 system.menu:
   type: mapping
   label: 'Menu settings'
   mapping:
     active_menus_default:
-      type: string
+      type: sequence
       label: 'Active menus'
+      sequence:
+        - type: string
+          label: 'Menu'
 
 system.performance:
   type: mapping
@@ -160,7 +139,7 @@ system.performance:
   mapping:
     cache:
       type: mapping
-      label: 'Cache'
+      label: 'Caching'
       mapping:
         page:
           type: mapping
@@ -168,7 +147,7 @@ system.performance:
           mapping:
             enabled:
               type: boolean
-              label: 'Page cache enabled'
+              label: 'Cache pages for anonymous users'
             max_age:
               type: integer
               label: 'Max age of page cache'
@@ -178,55 +157,55 @@ system.performance:
       mapping:
         preprocess:
           type: boolean
-          label: 'CSS preprocess'
+          label: 'Aggregate CSS files'
         gzip:
           type: boolean
-          label: 'CSS gzip'
+          label: 'Compress CSS files'
     js:
       type: mapping
-      label: 'JS performance settings'
+      label: 'Javascript performance settings'
       mapping:
         preprocess:
           type: boolean
-          label: 'JS preprocess'
+          label: 'Javascript preprocess'
         gzip:
           type: boolean
-          label: 'JS gzip'
+          label: 'Compress javascript files.'
     response:
       type: mapping
-      label: 'Cached page compression'
+      label: 'Response performance settings'
       mapping:
         gzip:
           type: boolean
-          label: 'Cached page gzip'
+          label: 'Compress cached pages'
     stale_file_threshold:
       type: integer
       label: 'Stale file threshold'
     theme_link:
       type: boolean
-      label: 'Theme link'
+      label: 'Force inline link rendering'
 
 system.rss:
   type: mapping
-  label: 'RSS settings'
+  label: 'Feed settings'
   mapping:
     channel:
       type: mapping
-      label: 'RSS channel'
+      label: 'Feed channel'
       mapping:
         description:
           type: string
-          label: 'RSS description'
+          label: 'Feed description'
     items:
       type: mapping
-      label: 'RSS items'
+      label: 'Feed items'
       mapping:
         limit:
           type: integer
-          description: 'RSS item limit'
+          label: 'Feed item limit'
         view_mode:
           type: string
-          description: 'RSS view mode'
+          label: 'Feed content'
 
 system.theme:
   type: mapping
@@ -234,10 +213,13 @@ system.theme:
   mapping:
     admin:
       type: string
-      label: 'Admin theme'
+      label: 'Administration theme'
     enabled:
-      type: string
+      type: sequence
       label: 'Enabled themes'
+      sequence:
+        - type: string
+          label: 'Theme'
 
 system.timezone:
   type: mapping
@@ -245,16 +227,17 @@ system.timezone:
   mapping:
     default:
       type: string
-      label: 'Default timezone settings'
+      label: 'Default time zone'
     user:
       type: mapping
+      label: 'User'
       mapping:
         configurable:
           type: boolean
-          label: 'User configurable timezones'
+          label: 'Users may set their own time zone'
         default:
           type: integer
-          label: 'Default timezone setting at registration'
+          label: 'Time zone for new users'
         warn:
           type: boolean
-          label: 'Warn user with no timezone'
+          label: 'Remind users at login if their time zone is not set'