diff -u b/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
--- b/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -74,7 +74,8 @@
   $modules = \Drupal::moduleHandler()->getModuleList();
   $options = array();
   foreach ($modules as $module) {
-    $breakpoint_group = \Drupal::state()->get(breakpoint_breakpoint_group_id($module));
+    $group_id = breakpoint_breakpoint_group_id($module);
+    $breakpoint_group = \Drupal::state()->get($group_id);
     if ($breakpoint_group) {
       foreach ($breakpoint_group['breakpoints'] as $breakpoint) {
         $options[$breakpoint['name']] = $breakpoint['label'] . ' (' . $module->info['name'] . ' - ' . $module->getType() . ') [' . $breakpoint['mediaQuery'] . ']';
@@ -83,7 +84,8 @@
   }
   $themes = \Drupal::service('theme_handler')->listInfo();
   foreach ($themes as $theme) {
-    $breakpoint_group = \Drupal::state()->get(breakpoint_breakpoint_group_id($theme));
+    $group_id = breakpoint_breakpoint_group_id($theme);
+    $breakpoint_group = \Drupal::state()->get($group_id);
     if ($breakpoint_group) {
       foreach ($breakpoint_group['breakpoints'] as $breakpoint) {
         $options[$breakpoint['name']] = $breakpoint['label'] . ' (' . $theme->info['name'] . ' - ' . $theme->getType() . ') [' . $breakpoint['mediaQuery'] . ']';
@@ -165,7 +167,8 @@
  *   The extension (module or theme) to delete breakpoints from.
  */
 function breakpoint_delete_extension_breakpoints(\Drupal\Core\Extension\Extension $extension) {
-  $breakpoint_group = breakpoint_load_breakpoint_group(breakpoint_breakpoint_group_id($extension));
+  $group_id = breakpoint_breakpoint_group_id($extension);
+  $breakpoint_group = breakpoint_load_breakpoint_group($group_id);
   \Drupal::state()->delete($breakpoint_group['id']);
   \Drupal::moduleHandler()->invokeAll('breakpoint_group_delete', array($breakpoint_group));
 }
only in patch2:
unchanged:
--- a/core/modules/toolbar/toolbar.info.yml
+++ b/core/modules/toolbar/toolbar.info.yml
@@ -6,3 +6,26 @@ package: Core
 version: VERSION
 dependencies:
   - breakpoint
+
+breakpoints:
+  narrow:
+    name: narrow
+    label: narrow
+    mediaQuery: 'only screen and (min-width: 16.5em)'
+    weight: 0
+    multipliers:
+      1x: 1x
+  standard:
+    name: standard
+    label: standard
+    mediaQuery: 'only screen and (min-width: 38.125em)'
+    weight: 1
+    multipliers:
+      1x: 1x
+  wide:
+    name: wide
+    label: wide
+    mediaQuery: 'only screen and (min-width: 61em)'
+    weight: 2
+    multipliers:
+      1x: 1x
only in patch2:
unchanged:
--- a/core/themes/seven/config/install/seven.breakpoints.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-mobile: '(min-width: 0em)'
-wide: 'screen and (min-width: 40em)'
only in patch2:
unchanged:
--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@@ -34,3 +34,19 @@ regions_hidden:
  
 settings:
   shortcut_module_link: true
+
+breakpoints:
+  mobile:
+    name: mobile
+    label: mobile
+    mediaQuery: '(min-width: 0em)'
+    weight: 0
+    multipliers:
+      1x: 1x
+  wide:
+    name: wide
+    label: wide
+    mediaQuery: 'screen and (min-width: 40em)'
+    weight: 1
+    multipliers:
+      1x: 1x
only in patch2:
unchanged:
--- a/core/themes/stark/config/install/stark.breakpoints.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-mobile: '(min-width: 0px)'
-narrow: 'all and (min-width: 480px) and (max-width: 959px)'
-wide: 'all and (min-width: 960px)'
only in patch2:
unchanged:
--- a/core/themes/stark/stark.info.yml
+++ b/core/themes/stark/stark.info.yml
@@ -9,3 +9,26 @@ stylesheets:
     - css/layout.css
 stylesheets-remove:
   - normalize.css
+
+breakpoints:
+  mobile:
+    name: mobile
+    label: mobile
+    mediaQuery: '(min-width: 0px)'
+    weight: 0
+    multipliers:
+      1x: 1x
+  narrow:
+    name: narrow
+    label: narrow
+    mediaQuery: 'all and (min-width: 480px) and (max-width: 959px)'
+    weight: 1
+    multipliers:
+      1x: 1x
+  wide:
+    name: wide
+    label: wide
+    mediaQuery: 'all and (min-width: 960px)'
+    weight: 2
+    multipliers:
+      1x: 1x