commit ef0c95630538e8e2463757028ac7ebfe6db525a3
Author: Joel Pittet <joel@pittet.ca>
Date:   Sun May 10 21:52:48 2015 -0700

    updates

diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 3985dd4..c2570c2 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -447,8 +447,7 @@ public function rebuildThemeData() {
         'sidebar_first' => 'Left sidebar',
         'sidebar_second' => 'Right sidebar',
         'content' => 'Content',
-        'header_first' => 'Header first',
-        'header_second' => 'Header second',
+        'header' => 'Header',
         'primary_menu' => 'Primary menu',
         'secondary_menu' => 'Secondary menu',
         'footer' => 'Footer',
diff --git a/core/modules/block/src/Tests/BlockRenderOrderTest.php b/core/modules/block/src/Tests/BlockRenderOrderTest.php
index b443c23..45bcf54 100644
--- a/core/modules/block/src/Tests/BlockRenderOrderTest.php
+++ b/core/modules/block/src/Tests/BlockRenderOrderTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
    */
   function testBlockRenderOrder() {
     // Enable test blocks and place them in the same region.
-    $region = 'header_second';
+    $region = 'header';
     $test_blocks = array(
       'stark_powered' => array(
         'weight' => '-3',
diff --git a/core/modules/block/src/Tests/BlockSystemBrandingTest.php b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
index 4854bc3..57ebc85 100644
--- a/core/modules/block/src/Tests/BlockSystemBrandingTest.php
+++ b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
       ->set('slogan', 'Community plumbing')
       ->save();
     // Add the system branding block to the page.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_second', 'id' => 'site-branding'));
+    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header', 'id' => 'site-branding'));
   }
 
   /**
diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php
index 2619cec..d6e0999 100644
--- a/core/modules/block/src/Tests/BlockTest.php
+++ b/core/modules/block/src/Tests/BlockTest.php
@@ -140,7 +140,7 @@ function testBlock() {
     $block['id'] = 'system_powered_by_block';
     $block['settings[label]'] = $this->randomMachineName(8);
     $block['theme'] = $this->config('system.theme')->get('default');
-    $block['region'] = 'header_second';
+    $block['region'] = 'header';
 
     // Set block title to confirm that interface works and override any custom titles.
     $this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], array('settings[label]' => $block['settings[label]'], 'id' => $block['id'], 'region' => $block['region']), t('Save block'));
@@ -276,7 +276,7 @@ function testHideBlockTitle() {
    *   - delta: The block's delta key.
    * @param string $region
    *   The machine name of the theme region to move the block to, for example
-   *   'header_second' or 'sidebar_first'.
+   *   'header' or 'sidebar_first'.
    */
   function moveBlockToRegion(array $block, $region) {
     // Set the created block to a specific region.
diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php
index 44d4cb4..1f3cb74 100644
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/src/Tests/BlockTestBase.php
@@ -59,8 +59,7 @@ protected function setUp() {
 
     // Define the existing regions.
     $this->regions = array(
-      'header_first',
-      'header_second',
+      'header',
       'sidebar_first',
       'content',
       'sidebar_second',
diff --git a/core/modules/block/src/Tests/BlockUiTest.php b/core/modules/block/src/Tests/BlockUiTest.php
index 7df170f..27cda9d 100644
--- a/core/modules/block/src/Tests/BlockUiTest.php
+++ b/core/modules/block/src/Tests/BlockUiTest.php
@@ -105,8 +105,8 @@ function testBlockAdminUiPage() {
       $this->assertTrue((string) $element[0] == $label, 'The "' . $label . '" block title is set inside the ' . $values['settings']['region'] . ' region.');
       // Look for a test block region select form element.
       $this->assertField('blocks[' . $values['settings']['id'] . '][region]', 'The block "' . $values['label'] . '" has a region assignment field.');
-      // Move the test block to the header_second region.
-      $edit['blocks[' . $values['settings']['id'] . '][region]'] = 'header_second';
+      // Move the test block to the header region.
+      $edit['blocks[' . $values['settings']['id'] . '][region]'] = 'header';
       // Look for a test block weight select form element.
       $this->assertField('blocks[' . $values['settings']['id'] . '][weight]', 'The block "' . $values['label'] . '" has a weight assignment field.');
       // Change the test block's weight.
@@ -117,8 +117,8 @@ function testBlockAdminUiPage() {
       // Check if the region and weight settings changes have persisted.
       $this->assertOptionSelected(
         'edit-blocks-' . $values['settings']['id']  . '-region',
-        'header_second',
-        'The block "' . $label . '" has the correct region assignment (header_second).'
+        'header',
+        'The block "' . $label . '" has the correct region assignment (header).'
       );
       $this->assertOptionSelected(
         'edit-blocks-' . $values['settings']['id']  . '-weight',
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index f79acb9..e04bada 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -28,7 +28,7 @@ class ConfigTranslationUiTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'contact', 'contact_test', 'config_translation', 'config_translation_test', 'views', 'views_ui', 'contextual', 'filter', 'filter_test', 'block');
+  public static $modules = ['node', 'contact', 'contact_test', 'config_translation', 'config_translation_test', 'views', 'views_ui', 'contextual', 'filter', 'filter_test', 'block'];
 
   /**
    * Languages to enable.
@@ -157,8 +157,8 @@ public function testSiteInformationTranslationUi() {
     $this->assertFieldByName('translation[config_names][system.site][name]', $fr_site_name);
     $this->assertFieldByName('translation[config_names][system.site][slogan]', $fr_site_slogan);
 
-    // Place branding block with site name and slogan into header_first region.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_first'));
+    // Place branding block with site name and slogan into header region.
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
 
     // Check French translation of site name and slogan are in place.
     $this->drupalGet('fr');
diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
index 876ec01..780b598 100644
--- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
@@ -393,8 +393,8 @@ function testUrlLanguageFallback() {
     // it is set by JavaScript.
     $this->drupalLogout();
 
-    // Place a site branding block in the header_first region.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_first'));
+    // Place a site branding block in the header region.
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
 
     // Access the front page without specifying any valid URL language prefix
     // and having as browser language preference a non-default language.
@@ -404,11 +404,11 @@ function testUrlLanguageFallback() {
 
     // Check that the language switcher active link matches the given browser
     // language.
-    $args = array(
+    $args = [
       ':id' => 'block-test-language-block',
       ':url' => \Drupal::url('<front>') . $langcode_browser_fallback,
       ':absolute_url' =>  \Drupal::url('<front>', [], ['absolute' => TRUE]) . $langcode_browser_fallback
-    );
+    ];
     $fields = $this->xpath('//div[@id=:id]//a[@class="language-link is-active" and starts-with(@href, :url)]', $args);
     $this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language');
 
diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index 3a8d68c..4e5060a 100644
--- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Component\Utility\String;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -168,7 +167,7 @@ public function build() {
     );
 
     $build['site_name'] = array(
-      '#markup' => String::checkPlain($site_config->get('name')),
+      '#markup' => $site_config->get('name'),
       '#access' => $this->configuration['use_site_name'],
     );
 
diff --git a/core/modules/system/src/Tests/System/PageTitleTest.php b/core/modules/system/src/Tests/System/PageTitleTest.php
index 88e6239..1b07ab6 100644
--- a/core/modules/system/src/Tests/System/PageTitleTest.php
+++ b/core/modules/system/src/Tests/System/PageTitleTest.php
@@ -23,7 +23,7 @@ class PageTitleTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'test_page_test', 'form_test', 'block');
+  public static $modules = ['node', 'test_page_test', 'form_test', 'block'];
 
   protected $contentUser;
   protected $savedTitle;
@@ -77,8 +77,8 @@ function testTitleXSS() {
     );
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
 
-    // Place branding block with site name and slogan into header_first region.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_first'));
+    // Place branding block with site name and slogan into header region.
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
 
     // Load frontpage.
     $this->drupalGet('');
diff --git a/core/modules/system/src/Tests/System/ThemeTest.php b/core/modules/system/src/Tests/System/ThemeTest.php
index afc8f12..66d6830 100644
--- a/core/modules/system/src/Tests/System/ThemeTest.php
+++ b/core/modules/system/src/Tests/System/ThemeTest.php
@@ -124,7 +124,7 @@ function testThemeSettings() {
 
       // Verify the actual 'src' attribute of the logo being output in a site
       // branding block.
-      $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_first'));
+      $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
       $this->drupalGet('');
       $elements = $this->xpath('//header//a[@rel=:rel]/img', array(
           ':rel' => 'home',
@@ -176,7 +176,7 @@ function testThemeSettings() {
     $fields = $this->xpath($this->constructFieldXpath('name', 'logo_path'));
     $uploaded_filename = 'public://' . $fields[0]['value'];
 
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header_first'));
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
     $this->drupalGet('');
     $elements = $this->xpath('//header//a[@rel=:rel]/img', array(
         ':rel' => 'home',
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 326ccba..83455f5 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -63,9 +63,7 @@
 <div class="layout-container">
 
   <header role="banner">
-    {{ page.header_first }}
-
-    {{ page.header_second }}
+    {{ page.header }}
   </header>
 
   {{ page.primary_menu }}
diff --git a/core/profiles/minimal/config/install/block.block.stark_branding.yml b/core/profiles/minimal/config/install/block.block.stark_branding.yml
index 59a8957..acf108f 100644
--- a/core/profiles/minimal/config/install/block.block.stark_branding.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_branding.yml
@@ -3,7 +3,7 @@ theme: stark
 weight: 0
 status: true
 langcode: en
-region: header_first
+region: header
 plugin: system_branding_block
 settings:
   id: system_branding_block
diff --git a/core/profiles/standard/config/install/block.block.bartik_branding.yml b/core/profiles/standard/config/install/block.block.bartik_branding.yml
index 69a9b87..3bed730 100644
--- a/core/profiles/standard/config/install/block.block.bartik_branding.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_branding.yml
@@ -3,7 +3,7 @@ theme: bartik
 weight: 0
 status: true
 langcode: en
-region: header_first
+region: header
 plugin: system_branding_block
 settings:
   id: system_branding_block
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index 97ab93d..3c02894 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -15,8 +15,7 @@ ckeditor_stylesheets:
   - css/components/content.css
   - css/components/table.css
 regions:
-  header_first: 'Header first'
-  header_second: 'Header second'
+  header: Header
   primary_menu: 'Primary menu'
   secondary_menu: 'Secondary menu'
   help: Help
diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index 99092f6..cbd32f2 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -43,9 +43,9 @@ a:active,
 .site-footer {
   background: #292929;
 }
-[class*="region-header-"],
-[class*="region-header-"] a,
-[class*="region-header-"] li a.active,
+.region-header,
+.region-header a,
+.region-header li a.active,
 .site-branding-text,
 .site-branding-block,
 .site-branding-text a,
diff --git a/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css
index bbab50f..553cd4d 100644
--- a/core/themes/bartik/css/components/header.css
+++ b/core/themes/bartik/css/components/header.css
@@ -6,7 +6,6 @@
   position: relative;
 }
 .region-header {
-  float: right; /* LTR */
   margin: .5em 5px .75em;
 }
 [dir="rtl"] .region-header {
@@ -93,37 +92,33 @@ h1.site-name {
   font-style: italic;
 }
 /* Region header blocks. */
-[class*="region-header-"] .block {
+.region-header .block {
   font-size: 0.857em;
   float: left; /* LTR */
   margin: 0;
   padding: 0;
 }
-.region-header-second .block {
-  font-size: 0.857em;
-  margin: 0 10px;
-}
-[class*="region-header-"] .block > h2 {
+.region-header .block > h2 {
   /* @extend .visually-hidden */
   position: absolute !important;
   clip: rect(1px, 1px, 1px, 1px);
   overflow: hidden;
   height: 1px;
 }
-[class*="region-header-"] .block .content {
+.region-header .block .content {
   margin: 0;
   padding: 0;
 }
-[class*="region-header-"] .block ul {
+.region-header .block ul {
   margin: 0;
   padding: 0;
 }
-[class*="region-header-"] .block li {
+.region-header .block li {
   list-style: none;
   list-style-image: none;
   padding: 0;
 }
-[class*="region-header-"] .form-text {
+.region-header .form-text {
   background: #fefefe;
   background: rgba(255, 255, 255, 0.7);
   border-color: #ccc;
@@ -131,88 +126,88 @@ h1.site-name {
   margin-right: 2px; /* LTR */
   width: 120px;
 }
-[dir="rtl"] [class*="region-header-"] .form-text {
+[dir="rtl"] .region-header .form-text {
   margin-left: 2px;
   margin-right: 0;
 }
-[class*="region-header-"] .form-text:hover,
-[class*="region-header-"] .form-text:focus,
-[class*="region-header-"] .form-text:active {
+.region-header .form-text:hover,
+.region-header .form-text:focus,
+.region-header .form-text:active {
   background: #fff;
   background: rgba(255, 255, 255, 0.8);
 }
-[class*="region-header-"] .form-required {
+.region-header .form-required:after {
   background-image: url(../../images/required.svg);
 }
-/* Block menus in header regions. */
-[class*="region-header-"] .block-menu {
+/* Region header block menus. */
+.region-header .block-menu {
   border: 1px solid;
   border-color: #eee;
   border-color: rgba(255, 255, 255, 0.2);
   padding: 0;
   width: 208px;
 }
-[class*="region-header-"] .block-menu li a {
+.region-header .block-menu li a {
   display: block;
   border-bottom: 1px solid;
   border-bottom-color: #eee;
   border-bottom-color: rgba(255, 255, 255, 0.2);
   padding: 3px 7px;
 }
-[class*="region-header-"] .block-menu li a:hover,
-[class*="region-header-"] .block-menu li a:focus,
-[class*="region-header-"] .block-menu li a:active {
+.region-header .block-menu li a:hover,
+.region-header .block-menu li a:focus,
+.region-header .block-menu li a:active {
   text-decoration: none;
   background: rgba(255, 255, 255, 0.15);
 }
-[class*="region-header-"] .block-menu li:last-child a {
+.region-header .block-menu li:last-child a {
   border-bottom: 0;
 }
-/* User Login block in header regions. */
-[class*="region-header-"] #block-user-login {
+/* User Login block in the header region. */
+.region-header #block-user-login {
   width: auto;
 }
-[class*="region-header-"] #block-user-login .content {
+.region-header #block-user-login .content {
   margin-top: 2px;
 }
-[class*="region-header-"] #block-user-login .form-item {
+.region-header #block-user-login .form-item {
   float: left; /* LTR */
   margin: 0;
   padding: 0;
 }
-[class*="region-header-"] #block-user-login div.item-list,
-[class*="region-header-"] #block-user-login div.description {
+.region-header #block-user-login div.item-list,
+.region-header #block-user-login div.description {
   font-size: 0.916em;
   margin: 0;
 }
-[class*="region-header-"] #block-user-login div.item-list {
+.region-header #block-user-login div.item-list {
   clear: both;
 }
-[class*="region-header-"] #block-user-login div.description {
+.region-header #block-user-login div.description {
   display: inline;
 }
-[class*="region-header-"] #block-user-login .item-list ul {
+.region-header #block-user-login .item-list ul {
   padding: 0;
   line-height: 1;
 }
-[class*="region-header-"] #block-user-login .item-list li {
+.region-header #block-user-login .item-list li {
   list-style: none;
   float: left; /* LTR */
   padding: 3px 0 1px;
 }
-[class*="region-header-"] #block-user-login .item-list li:last-child {
+.region-header #block-user-login .item-list li:last-child {
   padding-left: 0.5em; /* LTR */
 }
-[dir="rtl"] [class*="region-header-"] #block-user-login .item-list li:last-child {
+[dir="rtl"] .region-header #block-user-login .item-list li:last-child {
   padding-left: 0;
   padding-right: 0.5em;
 }
-[class*="region-header-"] #block-user-login .form-actions {
+.region-header #block-user-login .form-actions {
   margin: 4px 0 0;
   padding: 0;
   clear: both;
 }
-[class*="region-header-"] #block-user-login input.form-submit {
+.region-header #block-user-login input.form-submit {
   border: 1px solid;
   border-color: #ccc;
   border-color: rgba(255, 255, 255, 0.5);
@@ -221,20 +216,20 @@ h1.site-name {
   margin: 4px 0;
   padding: 3px 8px;
 }
-[class*="region-header-"] #block-user-login input.form-submit:hover,
-[class*="region-header-"] #block-user-login input.form-submit:focus {
+.region-header #block-user-login input.form-submit:hover,
+.region-header #block-user-login input.form-submit:focus {
   background: #fff;
   background: rgba(255, 255, 255, 0.9);
 }
-/* Search block in region headers. */
-[class*="region-header-"] #block-search-form {
+/* Search block in header region. */
+.region-header #block-search-form {
   width: 208px;
 }
-[class*="region-header-"] #block-search-form .form-text {
+.region-header #block-search-form .form-text {
   width: 154px;
 }
-/* Language switcher block in region headers. */
-[class*="region-header-"] .block-locale ul li {
+/* Language switcher block in header region. */
+.region-header .block-locale ul li {
   display: inline;
   padding: 0 0.5em;
 }
@@ -244,8 +239,8 @@ h1.site-name {
 
 [dir="rtl"] .site-logo,
 [dir="rtl"] .site-branding-text,
-[dir="rtl"] [class*="region-header-"] .block,
-[dir="rtl"] [class*="region-header-"] #block-user-login .form-item,
-[dir="rtl"] [class*="region-header-"] #block-user-login .item-list li {
+[dir="rtl"] .region-header .block,
+[dir="rtl"] .region-header #block-user-login .form-item,
+[dir="rtl"] .region-header #block-user-login .item-list li {
   float: right;
 }
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 069b76c..27e82ca 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -11,134 +11,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-#header div.section {
-  position: relative;
-}
-.region-header-second {
-  margin: .5em 5px .75em;
-}
-.region-header-first {
-  float: left; /* LTR */
-}
-.region-header-second {
-  float: right; /* LTR */
-}
-[dir="rtl"] .region-header-first {
-  float: right;
-}
-[dir="rtl"] .region-header-second {
-  float: left;
-}
-@media all and (min-width: 461px) and (max-width: 900px) {
-  .region-header {
-    margin: .5em 5px .75em;
-  }
-}
-@media all and (min-width: 901px) {
-  .region-header {
-    margin: 1em 5px 1.5em;
-  }
-}
-.region-secondary-menu .block-menu {
-  width: 100%;
-  margin: 0 auto;
-}
-#main-wrapper {
-  min-height: 300px;
-}
-#content .section,
-.sidebar .section {
-  padding: 0 15px;
-}
-#site-footer__wrapper {
-  padding: 35px 15px 30px;
-  box-sizing: border-box;
-}
-.region-featured-bottom-first,
-.region-featured-bottom-second,
-.region-featured-bottom-third {
-  box-sizing: border-box;
-  padding: 0 20px 0;
-}
-.region-footer-first,
-.region-footer-second,
-.region-footer-third,
-.region-footer-fourth,
-.region-footer-fifth {
-  box-sizing: border-box;
-  padding: 0 10px;
-}
-
-@media all and (min-width: 560px) and (max-width: 850px) {
-
-  #sidebar-first,
-  .region-featured-bottom-first,
-  .region-featured-bottom-second,
-  .region-featured-bottom-third,
-  .region-footer-first,
-  .region-footer-second,
-  .region-footer-third,
-  .region-footer-fourth {
-    display: inline;
-    float: left; /* LTR */
-    position: relative;
-  }
-  [dir="rtl"] #sidebar-first,
-  [dir="rtl"] .region-featured-bottom-first,
-  [dir="rtl"] .region-featured-bottom-second,
-  [dir="rtl"] .region-featured-bottom-third,
-  [dir="rtl"] .region-footer-first,
-  [dir="rtl"] .region-footer-second,
-  [dir="rtl"] .region-footer-third,
-  [dir="rtl"] .region-footer-fourth {
-    float: right;
-  }
-  #sidebar-first,
-  #sidebar-second {
-    width: 50%;
-  }
-  #sidebar-second {
-    margin-left: 50%; /* LTR */
-  }
-  [dir="rtl"] #sidebar-second {
-    margin-right: 50%;
-  }
-  .layout-one-sidebar #sidebar-first,
-  .layout-one-sidebar #sidebar-second {
-    width: 100%;
-  }
-  .layout-one-sidebar #sidebar-second {
-    margin-left: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-one-sidebar #sidebar-second {
-    margin-right: 0;
-  }
-  .region-featured-bottom-first,
-  .region-featured-bottom-second,
-  .region-featured-bottom-third {
-    box-sizing: border-box;
-    padding: 20px 15px 30px;
-    width: 33%;
-  }
-  .region-featured-bottom-second {
-    padding: 20px 5px 30px;
-  }
-  .region-footer-first,
-  .region-footer-second {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 50%;
-  }
-  .region-footer-third,
-  .region-footer-fourth {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 50%;
-  }
-  .region-footer-thirdcolumn {
-    clear: both;
-  }
-}
 
 @media all and (min-width: 851px) {
   .layout-container {
diff --git a/core/themes/bartik/templates/block--system-branding-block.html.twig b/core/themes/bartik/templates/block--system-branding-block.html.twig
index 4a4b733..6b5859f 100644
--- a/core/themes/bartik/templates/block--system-branding-block.html.twig
+++ b/core/themes/bartik/templates/block--system-branding-block.html.twig
@@ -13,6 +13,7 @@
  * - site_slogan: Slogan for site as defined in Site information settings.
  */
 #}
+{% set attributes = attributes.addClass('branding') %}
 {% block content %}
   {% if site_logo %}
     <a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-logo">
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index dfa7b5d..ba40693 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -12,7 +12,7 @@
   <div id="page">
     <header id="header" role="banner">
       <div class="section clearfix">
-        {{ page.header_first }}
+        {{ page.header }}
       </div>
     </header>
     <div id="main-wrapper">
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 9d2d730..aeae559 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -37,8 +37,7 @@
  *   comment/reply/12345).
  *
  * Regions:
- * - page.header_first: Items for the first header region.
- * - page.header_second: Items for the second header region.
+ * - page.header: Items for the header region.
  * - page.messages: Status and error messages. Should be displayed prominently.
  * - page.primary_menu: Items for the primary menu region.
  * - page.secondary_menu: Items for the secondary menu region.
@@ -67,8 +66,7 @@
     <header id="header" class="header" role="banner" aria-label="{{ 'Site header'|t}}">
       <div class="section layout-container clearfix">
         {{ page.secondary_menu }}
-        {{ page.header_first }}
-        {{ page.header_second }}
+        {{ page.header }}
         {{ page.primary_menu }}
       </div>
     </header>
diff --git a/core/themes/classy/templates/layout/maintenance-page.html.twig b/core/themes/classy/templates/layout/maintenance-page.html.twig
index a5b4bc9..7976af9 100644
--- a/core/themes/classy/templates/layout/maintenance-page.html.twig
+++ b/core/themes/classy/templates/layout/maintenance-page.html.twig
@@ -12,8 +12,7 @@
 <div class="layout-container">
 
   <header role="banner">
-    {{ page.header_first }}
-    {{ page.header_second }}
+    {{ page.header }}
   </header>
 
   <main role="main">
diff --git a/core/themes/classy/templates/layout/page.html.twig b/core/themes/classy/templates/layout/page.html.twig
index a4917e0..cd742e9 100644
--- a/core/themes/classy/templates/layout/page.html.twig
+++ b/core/themes/classy/templates/layout/page.html.twig
@@ -36,8 +36,6 @@
  *   comment/reply/12345).
  *
  * Regions:
- * - page.header_first: Items for the first header region.
- * - page.header_second: Items for the second header region.
  * - page.header: Items for the header region.
  * - page.messages: Status and error messages. Should be displayed prominently.
  * - page.primary_menu: Items for the primary menu region.
@@ -57,8 +55,6 @@
 <div class="layout-container">
 
   <header role="banner">
-    {{ page.header_first }}
-    {{ page.header_second }}
     {{ page.header }}
   </header>
 
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 43ffae2..73453a3 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -149,7 +149,7 @@ function seven_preprocess_install_page(&$variables) {
   $site_config = \Drupal::config('system.site');
   // Seven has custom styling for the install page.
   $variables['#attached']['library'][] = 'seven/install-page';
-  $variables['site_name'] = String::checkPlain($site_config->get('name'));
+  $variables['site_name'] = SafeMarkup::checkPlain($site_config->get('name'));
 }
 
 /**
@@ -159,7 +159,7 @@ function seven_preprocess_maintenance_page(&$variables) {
   $site_config = \Drupal::config('system.site');
   // Seven has custom styling for the maintenance page.
   $variables['#attached']['library'][] = 'seven/maintenance-page';
-  $variables['site_name'] = String::checkPlain($site_config->get('name'));
+  $variables['site_name'] = SafeMarkup::checkPlain($site_config->get('name'));
 }
 
 /**