diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index bd0bf89..1da1935 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -35,6 +35,3 @@ regions:
   footer_thirdcolumn: 'Footer third column'
   footer_fourthcolumn: 'Footer fourth column'
   footer: Footer
-
-settings:
-  shortcut_module_link: false
diff --git a/core/themes/bartik/config/install/bartik.settings.yml b/core/themes/bartik/config/install/bartik.settings.yml
index 48877a3..629e46e 100644
--- a/core/themes/bartik/config/install/bartik.settings.yml
+++ b/core/themes/bartik/config/install/bartik.settings.yml
@@ -1,4 +1,2 @@
-# @todo There is no UI yet for configuring this, but the setting is included
-#   here, because ConfigImportUITest requires a non-empty bartik.settings.yml
-#   file: https://drupal.org/node/2235901.
+# @todo There is no UI yet for configuring this.
 shortcut_module_link: false
diff --git a/core/themes/seven/config/schema/seven.schema.yml b/core/themes/seven/config/schema/seven.schema.yml
index 6d4c86e..5d99999 100644
--- a/core/themes/seven/config/schema/seven.schema.yml
+++ b/core/themes/seven/config/schema/seven.schema.yml
@@ -3,6 +3,12 @@
 seven.settings:
   type: theme_settings
   label: 'Seven settings'
+  mapping:
+    # @todo Module-specific settings should be defined by the module:
+    #   https://drupal.org/node/2235901.
+    shortcut_module_link:
+      type: boolean
+      label: 'Shortcut module link'
 
 seven.breakpoints:
   type: theme_breakpoints_default
diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml
index 9cf238f..3fb8a8a 100644
--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@@ -31,6 +31,3 @@ regions:
   sidebar_first: 'First sidebar'
 regions_hidden:
   - sidebar_first
-
-settings:
-  shortcut_module_link: true