diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index a41fd42..b472b8f 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -298,7 +298,7 @@ public function save(EntityInterface $entity) {
       $id = $entity->getOriginalID();
     }
     $config = config($prefix . $id);
-    $is_new = $entity->isNew();
+    $is_new = $config->isNew();
 
     if ($id !== $entity->id()) {
       // Renaming a config object needs to cater for:
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index f282f86..23e1533 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -313,8 +313,8 @@ function _block_get_renderable_region($list = array()) {
     !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD'));
 
   foreach ($list as $key => $block) {
-
-    if ($not_cacheable || in_array($block->get('cache'), array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))) {
+    $settings = $block->get('settings');
+    if ($not_cacheable || in_array($settings['cache'], array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))) {
       // Non-cached blocks get built immediately.
       if ($block->access()) {
         $build[$key] = entity_view($block, 'block');
@@ -330,7 +330,7 @@ function _block_get_renderable_region($list = array()) {
         '#pre_render' => array('_block_get_renderable_block'),
         '#cache' => array(
           'keys' => array($id, $block->get('module')),
-          'granularity' => $block->get('cache'),
+          'granularity' => $settings['cache'],
           'bin' => 'block',
           'tags' => array('content' => TRUE),
         ),
@@ -419,7 +419,6 @@ function block_theme_initialize($theme) {
       list(, $machine_name) = explode('.', $default_theme_block_id);
       $block = $default_theme_block->createDuplicate();
       $block->set('id', $theme . '.' . $machine_name);
-      $block->set('theme', $theme);
       // If the region isn't supported by the theme, assign the block to the
       // theme's default region.
       if (!isset($regions[$block->get('region')])) {
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php
index 4e29b74..f057f0a 100644
--- a/core/modules/block/lib/Drupal/block/BlockBase.php
+++ b/core/modules/block/lib/Drupal/block/BlockBase.php
@@ -52,6 +52,8 @@ public function getConfig() {
       // If the plugin configuration is not already set, initialize it with the
       // default settings for the block plugin.
       $this->configuration = $this->blockSettings();
+      // Ensure that the default cache mode is set.
+      $this->configuration += array('cache' => DRUPAL_NO_CACHE);
 
       // @todo This loads the default subject. Is this the right place to do so?
       $definition = $this->getDefinition();
diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/lib/Drupal/block/BlockFormController.php
index 305261c..9874acb 100644
--- a/core/modules/block/lib/Drupal/block/BlockFormController.php
+++ b/core/modules/block/lib/Drupal/block/BlockFormController.php
@@ -29,16 +29,13 @@ public function form(array $form, array &$form_state, EntityInterface $entity) {
       '#value' => $entity->id(),
     );
 
-    $form['settings'] = array(
-      '#weight' => -5,
-    );
-    $form['settings']['label'] = array(
+    $form['label'] = array(
       '#type' => 'textfield',
       '#title' => t('Block title'),
       '#maxlength' => 255,
       '#default_value' => !$entity->isNew() ? $entity->label() : $definition['subject'],
     );
-    $form['settings']['machine_name'] = array(
+    $form['machine_name'] = array(
       '#type' => 'textfield',
       '#title' => t('Block machine name'),
       '#maxlength' => 64,
@@ -181,8 +178,8 @@ public function form(array $form, array &$form_state, EntityInterface $entity) {
       '#description' => t('Show this block only for the selected role(s). If you select no roles, the block will be visible to all users.'),
     );
 
-    // Add specific configuration for this block type.
-    $form['configuration'] = $entity->getPlugin()->blockForm(array(), $form_state);
+    // Add plugin-specific settings for this block type.
+    $form['settings'] = $entity->getPlugin()->blockForm(array(), $form_state);
 
     return parent::form($form, $form_state, $entity);
   }
@@ -202,7 +199,7 @@ protected function actions(array $form, array &$form_state) {
   public function validate(array $form, array &$form_state) {
     parent::validate($form, $form_state);
 
-    if (empty($form['settings']['machine_name']['#disabled'])) {
+    if (empty($form['machine_name']['#disabled'])) {
       if (preg_match('/[^a-zA-Z0-9_]/', $form_state['values']['machine_name'])) {
         form_set_error('machine_name', t('Block name must be alphanumeric or underscores only.'));
       }
@@ -227,7 +224,8 @@ public function submit(array $form, array &$form_state) {
 
     $entity = $this->getEntity($form_state);
     $entity->getPlugin()->blockSubmit($form, $form_state);
-    $entity->set('configuration', $entity->getPlugin()->getConfig());
+    $entity->set('settings', $entity->getPlugin()->getConfig());
+
     $entity->save();
 
     drupal_set_message(t('The block configuration has been saved.'));
diff --git a/core/modules/block/lib/Drupal/block/BlockStorageController.php b/core/modules/block/lib/Drupal/block/BlockStorageController.php
index 6fb5ec5..a873c5d 100644
--- a/core/modules/block/lib/Drupal/block/BlockStorageController.php
+++ b/core/modules/block/lib/Drupal/block/BlockStorageController.php
@@ -25,10 +25,6 @@ public function create(array $values) {
       $definition = $entity->getPlugin()->getDefinition();
       $entity->set('module', $definition['module']);
     }
-    $configuration = $entity->get('configuration');
-    if (isset($configuration['cache'])) {
-      $entity->set('cache', $configuration['cache']);
-    }
 
     return $entity;
   }
@@ -57,24 +53,4 @@ public function loadByProperties(array $values = array()) {
     return $blocks;
   }
 
-  /**
-   * Overrides \Drupal\Core\Config\Entity\ConfigStorageController::preSave().
-   */
-  protected function preSave(EntityInterface $entity) {
-    parent::preSave($entity);
-
-    // Ensure that the theme is stored directly on the entity, to simplify
-    // \Drupal\Core\Config\Entity\ConfigStorageController::loadByProperties().
-    if (!$entity->get('theme')) {
-      list($theme) = explode('.', $entity->id());
-      $entity->set('theme', $theme);
-    }
-
-    // Cache settings are stored directly on the block, remove them from
-    // configuration.
-    $configuration = $entity->get('configuration');
-    unset($configuration['cache']);
-    $entity->set('configuration', $configuration);
-  }
-
 }
diff --git a/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php b/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
index 0ff8ecc..7996c93 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
@@ -58,11 +58,11 @@ class Block extends ConfigEntityBase {
   public $uuid;
 
   /**
-   * The plugin instance configuration.
+   * The plugin instance settings.
    *
    * @var array
    */
-  protected $configuration = array();
+  protected $settings = array();
 
   /**
    * The plugin instance.
@@ -95,20 +95,6 @@ class Block extends ConfigEntityBase {
   protected $weight;
 
   /**
-   * The block's caching state.
-   *
-   * @var int
-   */
-  protected $cache = DRUPAL_NO_CACHE;
-
-  /**
-   * The theme the block is placed in.
-   *
-   * @var string
-   */
-  protected $theme;
-
-  /**
    * The module owning this plugin.
    *
    * @var string
@@ -142,10 +128,10 @@ public function getPlugin() {
         throw new PluginException(format_string("The block '@block' did not specify a plugin.", array('@block' => $this->id())));
       }
 
-      // Create an instance of the plugin and store its configuration.
+      // Create a plugin instance and store its configuration as settings.
       try {
-        $this->instance = drupal_container()->get('plugin.manager.block')->createInstance($this->plugin, $this->configuration);
-        $this->configuration += $this->instance->getConfig();
+        $this->instance = drupal_container()->get('plugin.manager.block')->createInstance($this->plugin, $this->settings);
+        $this->settings += $this->instance->getConfig();
       }
       catch (PluginException $e) {
         // Ignore blocks belonging to disabled modules, but re-throw valid
@@ -159,6 +145,19 @@ public function getPlugin() {
   }
 
   /**
+   * Overrides \Drupal\Core\Config\Entity\ConfigEntityBase::get();
+   */
+  public function get($property_name, $langcode = NULL) {
+    // The theme is stored in the entity ID.
+    if ($property_name == 'theme') {
+      list($theme) = explode('.', $this->id());
+      return $theme;
+    }
+
+    return parent::get($property_name, $langcode);
+  }
+
+  /**
    * Overrides \Drupal\Core\Config\Entity\ConfigEntityBase::getExportProperties();
    */
   public function getExportProperties() {
@@ -168,13 +167,11 @@ public function getExportProperties() {
       'uuid',
       'region',
       'weight',
-      'cache',
       'module',
-      'theme',
       'status',
       'visibility',
       'plugin',
-      'configuration',
+      'settings',
     );
     $properties = array();
     foreach ($names as $name) {
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
index 1afb4d7..96f9343 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
@@ -192,7 +192,9 @@ function testCachePerPage() {
    * Private helper method to set the test block's cache mode.
    */
   private function setCacheMode($cache_mode) {
-    $this->block->set('cache', $cache_mode);
+    $settings = $this->block->get('settings');
+    $settings['cache'] = $cache_mode;
+    $this->block->set('settings', $settings);
     $this->block->save();
   }
 
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
index 5079ad8..6695681 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
@@ -96,13 +96,12 @@ protected function createTests() {
       'label' => '',
       'region' => '-1',
       'weight' => '',
-      'cache' => '1',
       'module' => 'block_test',
-      'theme' => 'stark',
       'status' => '1',
       'visibility' => array(),
       'plugin' => 'test_html_id',
-      'configuration' => array(
+      'settings' => array(
+        'cache' => '1',
         'subject' => t('Test block html id'),
       ),
     );
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index 5f72c7b..665e502 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -358,16 +358,19 @@ function testBlockRehash() {
     $block = $this->drupalPlaceBlock('test_cache', array('region' => 'header'));
 
     // Our test block's caching should default to DRUPAL_CACHE_PER_ROLE.
-    $this->assertEqual($block->get('cache'), DRUPAL_CACHE_PER_ROLE, 'Test block cache mode defaults to DRUPAL_CACHE_PER_ROLE.');
+    $settings = $block->get('settings');
+    $this->assertEqual($settings['cache'], DRUPAL_CACHE_PER_ROLE, 'Test block cache mode defaults to DRUPAL_CACHE_PER_ROLE.');
 
     // Disable caching for this block.
-    $block->set('cache', DRUPAL_NO_CACHE);
+    $settings['cache'] = DRUPAL_NO_CACHE;
+    $block->set('settings', $settings);
     $block->save();
     // Flushing all caches should call _block_rehash().
     $this->resetAll();
     // Verify that block is updated with the new caching mode.
     $block = entity_load('block', $block->id());
-    $this->assertEqual($block->get('cache'), DRUPAL_NO_CACHE, "Test block's database entry updated to DRUPAL_NO_CACHE.");
+    $settings = $block->get('settings');
+    $this->assertEqual($settings['cache'], DRUPAL_NO_CACHE, "Test block's database entry updated to DRUPAL_NO_CACHE.");
   }
 
   /**
diff --git a/core/modules/block/tests/config/plugin.core.block.stark.test_block.yml b/core/modules/block/tests/config/plugin.core.block.stark.test_block.yml
index 9ddba24..7428765 100644
--- a/core/modules/block/tests/config/plugin.core.block.stark.test_block.yml
+++ b/core/modules/block/tests/config/plugin.core.block.stark.test_block.yml
@@ -2,11 +2,10 @@ id: stark.test_block
 label: ''
 region: '-1'
 weight: ''
-cache: '1'
 module: block_test
-theme: stark
 status: '1'
 visibility: {  }
 plugin: test_html_id
-configuration:
+settings:
+  cache: '1'
   subject: 'Test block html id'
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
index 9f4b4a9..27d087a 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
@@ -78,7 +78,7 @@ function testRecentCommentBlock() {
     $this->assertTrue(strpos($this->drupalGetContent(), $comment3->comment) < strpos($this->drupalGetContent(), $comment2->subject), 'Comments were ordered correctly in block.');
 
     // Set the number of recent comments to show to 10.
-    $block->set('configuration', array('block_count' => 10));
+    $block->set('settings', array('block_count' => 10));
     $block->save();
 
     // Post an additional comment.
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
index 9aa5135..efcbf0e 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
@@ -143,7 +143,7 @@ function testCRUD() {
     ));
     $this->assertIdentical($same_id->isNew(), TRUE);
     $status = $same_id->save();
-    $this->assertIdentical($status, SAVED_NEW);
+    $this->assertIdentical($status, SAVED_UPDATED);
 
     // Verify that the entity was overwritten.
     $same_id = entity_load('config_test', $config_test->id());
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
index fa71476..5cd5b48 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
@@ -70,7 +70,7 @@ public function testNewForumTopicsBlock() {
     }
 
     // Configure the new forum topics block to only show 2 topics.
-    $block->set('configuration', array('block_count' => 2));
+    $block->set('settings', array('block_count' => 2));
     $block->save();
 
     $this->drupalGet('');
@@ -129,7 +129,7 @@ public function testActiveForumTopicsBlock() {
     }
 
     // Configure the active forum block to only show 2 topics.
-    $block->set('configuration', array('block_count' => 2));
+    $block->set('settings', array('block_count' => 2));
     $block->save();
 
     $this->drupalGet('');
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
index c3105db..3beb969 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
@@ -106,7 +106,7 @@ public function testRecentNodeBlock() {
     $this->drupalLogin($this->adminUser);
 
     // Set the number of recent nodes to show to 10.
-    $block->set('configuration', array('block_count' => 10));
+    $block->set('settings', array('block_count' => 10));
     $block->save();
 
     // Post an additional node.
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 2cfaf04..5f2a3ee 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -361,8 +361,8 @@ protected function drupalCreateContentType($settings = array()) {
    *   - machine_name: Random string.
    *   - region: 'sidebar_first'.
    *   - theme: The default theme.
-   * @param array $configuration
-   *   (optional) An associative array of plugin-specific configuration.
+   * @param array $settings
+   *   (optional) An associative array of plugin-specific settings.
    *
    * @return \Drupal\block\Plugin\Core\Entity\Block
    *   The block entity.
@@ -370,17 +370,17 @@ protected function drupalCreateContentType($settings = array()) {
    * @todo
    *   Add support for creating custom block instances.
    */
-  protected function drupalPlaceBlock($plugin_id, array $values = array(), array $configuration = array()) {
+  protected function drupalPlaceBlock($plugin_id, array $values = array(), array $settings = array()) {
     $values += array(
       'plugin' => $plugin_id,
       'label' => $this->randomName(8),
       'region' => 'sidebar_first',
       'theme' => variable_get('theme_default', 'stark'),
       'machine_name' => strtolower($this->randomName(8)),
+      'settings' => $settings,
     );
     // Build the ID out of the theme and machine_name.
     $values['id'] = $values['theme'] . '.' . $values['machine_name'];
-    $values['configuration'] = $configuration;
     $block = entity_create('block', $values);
     $block->save();
     return $block;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
index 22e6cb9..5ad865e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
@@ -71,7 +71,7 @@ protected function assertHookMessageOrder($messages) {
    */
   public function testBlockHooks() {
     $entity = entity_create('block', array(
-      'id' => 'stark.test_block',
+      'id' => 'stark.test_html_id',
       'plugin' => 'test_html_id',
     ));
     $_SESSION['entity_crud_hook_test'] = array();
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
index d4c3379..50a79ea 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
@@ -81,7 +81,7 @@ function testUserLoginBlock() {
    */
   function testWhosOnlineBlock() {
     $block = entity_load('block', 'stark.online');
-    $config = $block->get('configuration');
+    $config = $block->get('settings');
 
     // Generate users.
     $user1 = $this->drupalCreateUser(array());
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.content.yml b/core/profiles/standard/config/plugin.core.block.bartik.content.yml
index 1406a59..7f1a9f8 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.content.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.content.yml
@@ -1,8 +1,8 @@
 id: bartik.content
 plugin: system_main_block
-theme: bartik
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.footer.yml b/core/profiles/standard/config/plugin.core.block.bartik.footer.yml
index 4d03200..4496313 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.footer.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.footer.yml
@@ -1,8 +1,8 @@
 id: bartik.footer
 plugin: 'system_menu_block:menu-footer'
-theme: bartik
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 label: 'Footer menu'
 visibility:
   path:
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.help.yml b/core/profiles/standard/config/plugin.core.block.bartik.help.yml
index 0f46023..58d10a3 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.help.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.help.yml
@@ -1,8 +1,8 @@
 id: bartik.help
 plugin: system_help_block
-theme: bartik
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.login.yml b/core/profiles/standard/config/plugin.core.block.bartik.login.yml
index 1e780b6..21d73d8 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.login.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.login.yml
@@ -1,7 +1,8 @@
 id: bartik.login
 whois_new_count: '5'
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
@@ -18,5 +19,4 @@ module: user
 region: sidebar_first
 weight: '0'
 plugin: user_login_block
-theme: bartik
 langcode: und
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.powered.yml b/core/profiles/standard/config/plugin.core.block.bartik.powered.yml
index 165d5d0..446e51a 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.powered.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.powered.yml
@@ -1,8 +1,8 @@
 id: bartik.powered
 plugin: system_powered_by_block
-theme: bartik
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.search.yml b/core/profiles/standard/config/plugin.core.block.bartik.search.yml
index d69e7bb..3dcda34 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.search.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.search.yml
@@ -1,8 +1,8 @@
 id: bartik.search
 plugin: search_form_block
-theme: bartik
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.bartik.tools.yml b/core/profiles/standard/config/plugin.core.block.bartik.tools.yml
index 40df6d9..44e3aeb 100644
--- a/core/profiles/standard/config/plugin.core.block.bartik.tools.yml
+++ b/core/profiles/standard/config/plugin.core.block.bartik.tools.yml
@@ -1,8 +1,8 @@
 id: bartik.tools
 plugin: 'system_menu_block:menu-tools'
-theme: bartik
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.seven.content.yml b/core/profiles/standard/config/plugin.core.block.seven.content.yml
index 8a826c1..675f718 100644
--- a/core/profiles/standard/config/plugin.core.block.seven.content.yml
+++ b/core/profiles/standard/config/plugin.core.block.seven.content.yml
@@ -1,8 +1,8 @@
 id: seven.content
 plugin: system_main_block
-theme: seven
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.seven.help.yml b/core/profiles/standard/config/plugin.core.block.seven.help.yml
index bf2be94..72c4509 100644
--- a/core/profiles/standard/config/plugin.core.block.seven.help.yml
+++ b/core/profiles/standard/config/plugin.core.block.seven.help.yml
@@ -1,8 +1,8 @@
 id: seven.help
 plugin: system_help_block
-theme: seven
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/standard/config/plugin.core.block.seven.login.yml b/core/profiles/standard/config/plugin.core.block.seven.login.yml
index 7f19040..c35ba59 100644
--- a/core/profiles/standard/config/plugin.core.block.seven.login.yml
+++ b/core/profiles/standard/config/plugin.core.block.seven.login.yml
@@ -1,8 +1,8 @@
 id: seven.login
 plugin: user_login_block
-theme: seven
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/testing/config/plugin.core.block.stark.admin.yml b/core/profiles/testing/config/plugin.core.block.stark.admin.yml
index e7d832d..5ca8d1f 100644
--- a/core/profiles/testing/config/plugin.core.block.stark.admin.yml
+++ b/core/profiles/testing/config/plugin.core.block.stark.admin.yml
@@ -1,8 +1,8 @@
 id: stark.admin
 plugin: 'system_menu_block:menu-admin'
-theme: stark
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'
diff --git a/core/profiles/testing/config/plugin.core.block.stark.online.yml b/core/profiles/testing/config/plugin.core.block.stark.online.yml
index db1f2cc..a00e02d 100644
--- a/core/profiles/testing/config/plugin.core.block.stark.online.yml
+++ b/core/profiles/testing/config/plugin.core.block.stark.online.yml
@@ -1,14 +1,13 @@
 id: stark.online
 label: 'Who''s online'
 plugin: user_online_block
-theme: stark
-configuration:
+settings:
   properties:
     administrative: '1'
   seconds_online: '900'
   max_list_count: '10'
+  cache: '-1'
 status: '1'
-cache: '-1'
 label: 'Who''s online'
 visibility:
   path:
diff --git a/core/profiles/testing/config/plugin.core.block.stark.tools.yml b/core/profiles/testing/config/plugin.core.block.stark.tools.yml
index bda5f0f..d68441e 100644
--- a/core/profiles/testing/config/plugin.core.block.stark.tools.yml
+++ b/core/profiles/testing/config/plugin.core.block.stark.tools.yml
@@ -1,8 +1,8 @@
 id: stark.tools
 plugin: 'system_menu_block:menu-tools'
-theme: stark
 status: '1'
-cache: '-1'
+settings:
+  cache: '-1'
 visibility:
   path:
     visibility: '0'