diff --git a/core/profiles/standard/config/block.block.bartik.account_links.yml b/core/profiles/standard/config/block.block.bartik.account_links.yml
deleted file mode 100644
index 64bdb5f..0000000
--- a/core/profiles/standard/config/block.block.bartik.account_links.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: bartik.account_links
-label: 'Account links'
-region: secondary_menu
-weight: '0'
-module: menu
-status: '1'
-plugin: menu_navigation
-settings:
-  menu: account
-  level: '0'
-  id: secondary-menu
-  subject: 'Menu Navigation'
-langcode: und
diff --git a/core/profiles/standard/config/block.block.bartik.main_menu.yml b/core/profiles/standard/config/block.block.bartik.main_menu.yml
deleted file mode 100644
index 895c255..0000000
--- a/core/profiles/standard/config/block.block.bartik.main_menu.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: bartik.main_menu
-label: 'Main menu'
-region: main_menu
-weight: '0'
-module: menu
-status: '1'
-plugin: menu_navigation
-settings:
-  menu: main
-  level: '0'
-  id: main-menu
-  subject: 'Menu Navigation'
-langcode: und
diff --git a/core/profiles/standard/config/block.block.bartik_account_links.yml b/core/profiles/standard/config/block.block.bartik_account_links.yml
new file mode 100644
index 0000000..711bef5
--- /dev/null
+++ b/core/profiles/standard/config/block.block.bartik_account_links.yml
@@ -0,0 +1,15 @@
+id: bartik_account_links
+uuid: a41e843f-d19c-4528-ab02-2fc335e12b1e
+theme: bartik
+label: 'Account links'
+region: secondary_menu
+weight: '0'
+module: menu
+status: '1'
+plugin: menu_navigation
+settings:
+  menu: account
+  level: '0'
+  id: secondary-menu
+  subject: 'Menu Navigation'
+langcode: en
diff --git a/core/profiles/standard/config/block.block.bartik_main_menu.yml b/core/profiles/standard/config/block.block.bartik_main_menu.yml
new file mode 100644
index 0000000..6232846
--- /dev/null
+++ b/core/profiles/standard/config/block.block.bartik_main_menu.yml
@@ -0,0 +1,15 @@
+id: bartik_main_menu
+theme: bartik
+uuid: a30e843f-d19c-4528-ab02-2fc335e12b1e
+label: 'Main menu'
+region: main_menu
+weight: '0'
+module: menu
+status: '1'
+plugin: menu_navigation
+settings:
+  menu: main
+  level: '0'
+  id: main-menu
+  subject: 'Menu Navigation'
+langcode: en
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index 227e6fb..e9fad10 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -3,7 +3,7 @@
  * @file
  * Install, update and uninstall functions for the standard installation profile.
  */
-use Drupal\Component\Uuid\Uuid;
+//use Drupal\Component\Uuid\Uuid;
 
 /**
  * Implements hook_install().
@@ -94,7 +94,7 @@ function standard_install() {
  *
  * @ingroup config_upgrade
  */
-function standard_update_8000() {
+/*function standard_update_8000() {
   // Place main-menu.
   $block = \Drupal::config('block.block.bartik.main_menu');
   $uuid = new Uuid();
@@ -136,4 +136,4 @@ function standard_update_8000() {
         'subject' => 'Menu Navigation',
       ));
   $block->save();
-}
+}*/
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index 8066b06..16829f7 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -18,6 +18,8 @@ regions:
   help: Help
   page_top: 'Page top'
   page_bottom: 'Page bottom'
+  secondary_menu: 'Secondary menu'
+  main_menu: 'Main menu'
   highlighted: Highlighted
   featured: Featured
   content: Content
@@ -31,8 +33,6 @@ regions:
   footer_thirdcolumn: 'Footer third column'
   footer_fourthcolumn: 'Footer fourth column'
   footer: Footer
-  secondary_menu: 'Secondary menu'
-  main_menu: 'Main menu'
 # @todo D8: Remove once themes have to be installed.
 settings:
   shortcut_module_link: '0'
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index d25d2b0..0e4362e 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -191,8 +191,10 @@ function bartik_field__taxonomy_term_reference($variables) {
 /**
  * Implements hook_block_view_alter().
  */
-function bartik_block_view_alter(array &$build, Block $block) {
-  if ($block->getPluginId() == 'bartik.main_menu') {
+function bartik_block_view_alter(array &$build,  \Drupal\block\BlockPluginInterface $block) {
+  return;
+  $configuration = $block->getConfiguration();
+  if (isset($configuration['id']) && $configuration['id'] == 'main-menu') {
     $build['#prefix'] = '<nav id="main-menu" class="navigation" role="navigation">';
     $build['#suffix'] = '</nav>';
     $build['#theme'] = 'links__system_main_menu';
@@ -203,7 +205,7 @@ function bartik_block_view_alter(array &$build, Block $block) {
       'class' => array('element-invisible'),
     );
   }
-  if ($block->getPluginId() == 'bartik.account_links') {
+  if (isset($configuration['id']) && $configuration['id'] == 'secondary-menu') {
     $build['#prefix'] = '<nav id="secondary-menu" class="navigation" role="navigation">';
     $build['#suffix'] = '</nav>';
     $build['#theme'] = 'links__system_secondary_menu';