diff --git a/2398451-34.patch b/2398451-41.patch
index b0021c2..213ef93 100644
--- a/2398451-34.patch
+++ b/2398451-41.patch
@@ -1,5 +1,5 @@
diff --git a/core/themes/bartik/css/base/elements.css b/core/themes/bartik/css/base/elements.css
index 2625c9f..bc7567b6eb45b5..5565dd8 100644
--- a/core/themes/bartik/css/base/elements.css
+++ b/core/themes/bartik/css/base/elements.css
@@ -1,6 +1,9 @@
@@ -128,14 +128,12 @@ index 6fdb71a..07f2a5c 100644
   color: #000;
   font-size: 1.4em;
diff --git a/core/themes/bartik/css/components/footer.css b/core/themes/bartik/css/components/footer.css
index a1f9f76..6cdaf922bac459..6cdaf92 100644
--- a/core/themes/bartik/css/components/footer.css
+++ b/core/themes/bartik/css/components/footer.css
@@ -1,7 +1,45-2,6 +2,44 @@/* ------------------ Footer ------------------ */
 
 -#footer-wrapper {
+#site-footer__wrapper#site-footer__wrapper {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  padding: 35px 15px 30px;
+}
@@ -249,10 +247,10 @@ index 7f1d5d8..f23ec5b 100644
 .sidebar .block {
   border-style: solid;
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 8d36908..bb23434a454b36..119dd2d 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -1,245 +1,29-1,22 +1,12 @@
+/**
+ * @file
+ * Bartik layout styling.
@@ -283,130 +281,9 @@ index 8d36908..bb23434 100644
   max-width: 860px;
   margin-left: auto;
   margin-right: auto;
@@ -142,101 +132,18 @@ body,
 }
-#header div.section {
-  position: relative;
-}
-.region-header {
-  float: right; /* LTR */
-  margin: .5em 5px .75em;
-}
-[dir="rtl"] .region-header {
-  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 0 30px;
-}
-#site-footer__wrapper .section {
-  box-sizing: border-box;
-  padding: 0 15px;
-}
-.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 {
-  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) {
-
-  #header div.section,