diff -u b/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
--- b/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -66 +66 @@
-      css/print.css: {}
+      css/print.css: { media: print }
diff -u /dev/null b/core/themes/bartik/css/components/colors.css
--- /dev/null
+++ b/core/themes/bartik/css/components/colors.css
@@ -0,0 +1,73 @@
+/* ---------- Color Module Styles ----------- */
+
+body {
+  color: #3b3b3b;
+}
+.comment .comment-arrow {
+  border-color: #ffffff;
+}
+#page,
+#main-wrapper,
+.region-primary-menu .menu li a.active,
+.region-primary-menu .menu li .active-trail a {
+  background: #ffffff;
+}
+.tabs ul.primary li a.active {
+  background-color: #ffffff;
+}
+.tabs ul.primary li.active a {
+  background-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+#header {
+  background-color: #1d84c3;
+  background-image: -webkit-linear-gradient(top, #055a8e 0%, #1d84c3 100%);
+  background-image: linear-gradient(to bottom, #055a8e 0%, #1d84c3 100%);
+}
+a,
+.link {
+  color: #0071b3;
+}
+a:hover,
+a:focus,
+.link:hover,
+.link:focus {
+  color: #018fe2;
+}
+a:active,
+.link:active {
+  color: #23aeff;
+}
+.sidebar .block {
+  background-color: #f6f6f2;
+  border-color: #f9f9f9;
+}
+#page-wrapper,
+#footer-wrapper {
+  background: #292929;
+}
+.region-header,
+.region-header a,
+.region-header li a.active,
+#name-and-slogan,
+.site-branding-block,
+#name-and-slogan a,
+.site-branding-block a,
+.region-secondary-menu .menu li a {
+  color: #fffeff;
+}
+
+/* ---------- Color Form ----------- */
+
+[dir="rtl"] .color-form #palette {
+  margin-left: 0;
+  margin-right: 20px;
+}
+[dir="rtl"] .color-form .form-item label {
+  float: right;
+}
+[dir="rtl"] .color-form #palette .lock {
+  right: -20px;
+  left: 0;
+}
+
reverted:
--- b/core/themes/bartik/css/components/colors.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ---------- Color Module Styles ----------- */
-
-body {
-  color: #3b3b3b;
-}
-.comment .comment-arrow {
-  border-color: #ffffff;
-}
-#page,
-#main-wrapper,
-.region-primary-menu .menu li a.active,
-.region-primary-menu .menu li .active-trail a {
-  background: #ffffff;
-}
-.tabs ul.primary li a.active {
-  background-color: #ffffff;
-}
-.tabs ul.primary li.active a {
-  background-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-#header {
-  background-color: #1d84c3;
-  background-image: -webkit-linear-gradient(top, #055a8e 0%, #1d84c3 100%);
-  background-image: linear-gradient(to bottom, #055a8e 0%, #1d84c3 100%);
-}
-a,
-.link {
-  color: #0071b3;
-}
-a:hover,
-a:focus,
-.link:hover,
-.link:focus {
-  color: #018fe2;
-}
-a:active,
-.link:active {
-  color: #23aeff;
-}
-.sidebar .block {
-  background-color: #f6f6f2;
-  border-color: #f9f9f9;
-}
-#page-wrapper,
-#footer-wrapper {
-  background: #292929;
-}
-.region-header,
-.region-header a,
-.region-header li a.active,
-#name-and-slogan,
-.site-branding-block,
-#name-and-slogan a,
-.site-branding-block a,
-.region-secondary-menu .menu li a {
-  color: #fffeff;
-}
-
-/* ---------- Color Form ----------- */
-
-[dir="rtl"] .color-form #palette {
-  margin-left: 0;
-  margin-right: 20px;
-}
-[dir="rtl"] .color-form .form-item label {
-  float: right;
-}
-[dir="rtl"] .color-form #palette .lock {
-  right: -20px;
-  left: 0;
-}
-
diff -u /dev/null b/core/themes/bartik/css/layout/layout.css
--- /dev/null
+++ b/core/themes/bartik/css/layout/layout.css
@@ -0,0 +1,239 @@
+
+/* ---------- Basic Layout Styles ----------- */
+
+html,
+body,
+#page  {
+  height: 100%;
+}
+#page-wrapper {
+  min-height: 100%;
+}
+#header div.section,
+#featured aside.section,
+#messages div.section,
+#main,
+#triptych,
+#footer-columns,
+#footer {
+  width: 100%;
+  max-width: 860px;
+  margin-left: auto;
+  margin-right: auto;
+}
+#header div.section {
+  position: relative;
+}
+.region-header {
+  float: right; /* LTR */
+  margin: .5em 5px .75em;
+}
+[dir="rtl"] .region-header {
+  float: left;
+}
+.region-secondary-menu .block-menu {
+  width: 100%;
+  margin: 0 auto;
+}
+#main-wrapper {
+  min-height: 300px;
+}
+#content .section,
+.sidebar .section {
+  padding: 0 15px;
+}
+.breadcrumb {
+  margin: 0 15px;
+}
+#footer-wrapper {
+  padding: 35px 0 30px;
+}
+#footer-wrapper .section {
+  box-sizing: border-box;
+  padding: 0 15px;
+}
+.region-triptych-first,
+.region-triptych-middle,
+.region-triptych-last {
+  box-sizing: border-box;
+  padding: 0 20px 0;
+}
+.region-footer-firstcolumn,
+.region-footer-secondcolumn,
+.region-footer-thirdcolumn,
+.region-footer-fourthcolumn {
+  box-sizing: border-box;
+  padding: 0 10px;
+}
+
+@media all and (min-width: 560px) and (max-width: 850px) {
+
+  #sidebar-first,
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last,
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] #sidebar-first,
+  [dir="rtl"] .region-triptych-first,
+  [dir="rtl"] .region-triptych-middle,
+  [dir="rtl"] .region-triptych-last,
+  [dir="rtl"] .region-footer-firstcolumn,
+  [dir="rtl"] .region-footer-secondcolumn,
+  [dir="rtl"] .region-footer-thirdcolumn,
+  [dir="rtl"] .region-footer-fourthcolumn {
+    float: right;
+  }
+  #sidebar-first,
+  #sidebar-second {
+    width: 50%;
+  }
+  #sidebar-second {
+    margin-left: 50%; /* LTR */
+  }
+  [dir="rtl"] #sidebar-second {
+    margin-right: 50%;
+  }
+  .one-sidebar #sidebar-first,
+  .one-sidebar #sidebar-second {
+    width: 100%;
+  }
+  .one-sidebar #sidebar-second {
+    margin-left: 0; /* LTR */
+  }
+  [dir="rtl"] .one-sidebar #sidebar-second {
+    margin-right: 0;
+  }
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last {
+    box-sizing: border-box;
+    padding: 20px 15px 30px;
+    width: 33%;
+  }
+  .region-triptych-middle {
+    padding: 20px 5px 30px;
+  }
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn {
+    box-sizing: border-box;
+    padding: 0 10px;
+    width: 50%;
+  }
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    box-sizing: border-box;
+    padding: 0 10px;
+    width: 50%;
+  }
+  .region-footer-thirdcolumn {
+    clear: both;
+  }
+}
+
+@media all and (min-width: 851px) {
+
+  #header div.section,
+  #featured aside.section,
+  #messages div.section,
+  #main,
+  #triptych,
+  #footer-columns,
+  #footer {
+    max-width: 1290px;
+  }
+  #content,
+  #sidebar-first,
+  #sidebar-second,
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last,
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] #content,
+  [dir="rtl"] #sidebar-first,
+  [dir="rtl"] #sidebar-second,
+  [dir="rtl"] .region-triptych-first,
+  [dir="rtl"] .region-triptych-middle,
+  [dir="rtl"] .region-triptych-last,
+  [dir="rtl"] .region-footer-firstcolumn,
+  [dir="rtl"] .region-footer-secondcolumn,
+  [dir="rtl"] .region-footer-thirdcolumn,
+  [dir="rtl"] .region-footer-fourthcolumn {
+    float: right;
+  }
+  .layout-two-sidebars #content {
+    margin-left: 25%;
+    margin-right: 25%;
+    width: 50%;
+  }
+  .layout-one-sidebar #content {
+    width: 75%;
+  }
+  .layout-no-sidebars #content {
+    width: 100%;
+  }
+  .layout-sidebar-first #content {
+    margin-left: 25%; /* LTR */
+    margin-right: 0; /* LTR */
+  }
+  [dir="rtl"] .layout-sidebar-first #content {
+    margin-left: 0;
+    margin-right: 25%;
+  }
+  .layout-sidebar-second #content {
+    margin-right: 25%; /* LTR */
+    margin-left: 0; /* LTR */
+  }
+  [dir="rtl"] .layout-sidebar-second #content {
+    margin-right: 0;
+    margin-left: 25%;
+  }
+  #sidebar-first {
+    width: 25%;
+    margin-left: -100%; /* LTR */
+  }
+  [dir="rtl"] #sidebar-first {
+    margin-right: -100%;
+  }
+  #sidebar-second {
+    width: 25%;
+    margin-left: -25%; /* LTR */
+    clear: none;
+  }
+  [dir="rtl"] #sidebar-second {
+    margin-right: -25%;
+  }
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last {
+    width: 33%;
+  }
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    box-sizing: border-box;
+    padding: 0 10px;
+    width: 25%;
+  }
+}
+/* ------------------- Main ------------------- */
+
+#main {
+  margin-top: 20px;
+  margin-bottom: 40px;
+}
+
reverted:
--- b/core/themes/bartik/css/layout/layout.css
+++ /dev/null
@@ -1,239 +0,0 @@
-
-/* ---------- Basic Layout Styles ----------- */
-
-html,
-body,
-#page  {
-  height: 100%;
-}
-#page-wrapper {
-  min-height: 100%;
-}
-#header div.section,
-#featured aside.section,
-#messages div.section,
-#main,
-#triptych,
-#footer-columns,
-#footer {
-  width: 100%;
-  max-width: 860px;
-  margin-left: auto;
-  margin-right: auto;
-}
-#header div.section {
-  position: relative;
-}
-.region-header {
-  float: right; /* LTR */
-  margin: .5em 5px .75em;
-}
-[dir="rtl"] .region-header {
-  float: left;
-}
-.region-secondary-menu .block-menu {
-  width: 100%;
-  margin: 0 auto;
-}
-#main-wrapper {
-  min-height: 300px;
-}
-#content .section,
-.sidebar .section {
-  padding: 0 15px;
-}
-.breadcrumb {
-  margin: 0 15px;
-}
-#footer-wrapper {
-  padding: 35px 0 30px;
-}
-#footer-wrapper .section {
-  box-sizing: border-box;
-  padding: 0 15px;
-}
-.region-triptych-first,
-.region-triptych-middle,
-.region-triptych-last {
-  box-sizing: border-box;
-  padding: 0 20px 0;
-}
-.region-footer-firstcolumn,
-.region-footer-secondcolumn,
-.region-footer-thirdcolumn,
-.region-footer-fourthcolumn {
-  box-sizing: border-box;
-  padding: 0 10px;
-}
-
-@media all and (min-width: 560px) and (max-width: 850px) {
-
-  #sidebar-first,
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last,
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn,
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    display: inline;
-    float: left; /* LTR */
-    position: relative;
-  }
-  [dir="rtl"] #sidebar-first,
-  [dir="rtl"] .region-triptych-first,
-  [dir="rtl"] .region-triptych-middle,
-  [dir="rtl"] .region-triptych-last,
-  [dir="rtl"] .region-footer-firstcolumn,
-  [dir="rtl"] .region-footer-secondcolumn,
-  [dir="rtl"] .region-footer-thirdcolumn,
-  [dir="rtl"] .region-footer-fourthcolumn {
-    float: right;
-  }
-  #sidebar-first,
-  #sidebar-second {
-    width: 50%;
-  }
-  #sidebar-second {
-    margin-left: 50%; /* LTR */
-  }
-  [dir="rtl"] #sidebar-second {
-    margin-right: 50%;
-  }
-  .one-sidebar #sidebar-first,
-  .one-sidebar #sidebar-second {
-    width: 100%;
-  }
-  .one-sidebar #sidebar-second {
-    margin-left: 0; /* LTR */
-  }
-  [dir="rtl"] .one-sidebar #sidebar-second {
-    margin-right: 0;
-  }
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last {
-    box-sizing: border-box;
-    padding: 20px 15px 30px;
-    width: 33%;
-  }
-  .region-triptych-middle {
-    padding: 20px 5px 30px;
-  }
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 50%;
-  }
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 50%;
-  }
-  .region-footer-thirdcolumn {
-    clear: both;
-  }
-}
-
-@media all and (min-width: 851px) {
-
-  #header div.section,
-  #featured aside.section,
-  #messages div.section,
-  #main,
-  #triptych,
-  #footer-columns,
-  #footer {
-    max-width: 1290px;
-  }
-  #content,
-  #sidebar-first,
-  #sidebar-second,
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last,
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn,
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    display: inline;
-    float: left; /* LTR */
-    position: relative;
-  }
-  [dir="rtl"] #content,
-  [dir="rtl"] #sidebar-first,
-  [dir="rtl"] #sidebar-second,
-  [dir="rtl"] .region-triptych-first,
-  [dir="rtl"] .region-triptych-middle,
-  [dir="rtl"] .region-triptych-last,
-  [dir="rtl"] .region-footer-firstcolumn,
-  [dir="rtl"] .region-footer-secondcolumn,
-  [dir="rtl"] .region-footer-thirdcolumn,
-  [dir="rtl"] .region-footer-fourthcolumn {
-    float: right;
-  }
-  .layout-two-sidebars #content {
-    margin-left: 25%;
-    margin-right: 25%;
-    width: 50%;
-  }
-  .layout-one-sidebar #content {
-    width: 75%;
-  }
-  .layout-no-sidebars #content {
-    width: 100%;
-  }
-  .layout-sidebar-first #content {
-    margin-left: 25%; /* LTR */
-    margin-right: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-sidebar-first #content {
-    margin-left: 0;
-    margin-right: 25%;
-  }
-  .layout-sidebar-second #content {
-    margin-right: 25%; /* LTR */
-    margin-left: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-sidebar-second #content {
-    margin-right: 0;
-    margin-left: 25%;
-  }
-  #sidebar-first {
-    width: 25%;
-    margin-left: -100%; /* LTR */
-  }
-  [dir="rtl"] #sidebar-first {
-    margin-right: -100%;
-  }
-  #sidebar-second {
-    width: 25%;
-    margin-left: -25%; /* LTR */
-    clear: none;
-  }
-  [dir="rtl"] #sidebar-second {
-    margin-right: -25%;
-  }
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last {
-    width: 33%;
-  }
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn,
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 25%;
-  }
-}
-/* ------------------- Main ------------------- */
-
-#main {
-  margin-top: 20px;
-  margin-bottom: 40px;
-}
-
reverted:
--- /dev/null
+++ a/core/themes/bartik/css/maintenance-page.css
@@ -0,0 +1,74 @@
+body.maintenance-page {
+  background-color: #fff;
+  color: #000;
+}
+.maintenance-page #page-wrapper {
+  background: #fff;
+  margin-left: auto;
+  margin-right: auto;
+  min-width: 0;
+  min-height: 0;
+  border: 1px solid #ddd;
+  margin-top: 40px;
+}
+.maintenance-page #page {
+  margin: 10px;
+}
+.maintenance-page #main-wrapper {
+  min-height: inherit;
+}
+.maintenance-page #header,
+.maintenance-page #messages {
+  width: auto;
+}
+.maintenance-page #main {
+  margin: 0;
+}
+.maintenance-page #content .section {
+  padding: 0 0 0 10px;
+}
+.maintenance-page #header {
+  background-color: #fff;
+  background-image: none;
+}
+.maintenance-page #name-and-slogan {
+  margin-bottom: 50px;
+  margin-left: 0;
+  padding-top: 20px;
+  font-size: 90%;
+}
+.maintenance-page #name-and-slogan,
+.maintenance-page #name-and-slogan a,
+.maintenance-page #name-and-slogan a:hover,
+.maintenance-page #name-and-slogan a:focus {
+  color: #777;
+}
+.maintenance-page  h1#page-title {
+  line-height: 1em;
+  margin-top: 0;
+}
+.maintenance-page #messages {
+  padding: 0;
+  margin-top: 30px;
+}
+.maintenance-page #messages div.messages {
+  margin: 0;
+}
+@media all and (min-width: 800px) {
+  .maintenance-page #page-wrapper {
+    width: 800px;
+  }
+  .maintenance-page #header div.section,
+  .maintenance-page #main {
+    width: 700px;
+  }
+  .maintenance-page #messages div.section {
+    padding: 0;
+    width: auto;
+  }
+}
+@media all and (min-width: 600px) { /* @TODO find the proper breakpoint */
+  .maintenance-page #page {
+    margin: 20px 40px 40px;
+  }
+}
reverted:
--- b/core/themes/bartik/css/theme/maintenance-page.css
+++ /dev/null
@@ -1,74 +0,0 @@
-body.maintenance-page {
-  background-color: #fff;
-  color: #000;
-}
-.maintenance-page #page-wrapper {
-  background: #fff;
-  margin-left: auto;
-  margin-right: auto;
-  min-width: 0;
-  min-height: 0;
-  border: 1px solid #ddd;
-  margin-top: 40px;
-}
-.maintenance-page #page {
-  margin: 10px;
-}
-.maintenance-page #main-wrapper {
-  min-height: inherit;
-}
-.maintenance-page #header,
-.maintenance-page #messages {
-  width: auto;
-}
-.maintenance-page #main {
-  margin: 0;
-}
-.maintenance-page #content .section {
-  padding: 0 0 0 10px;
-}
-.maintenance-page #header {
-  background-color: #fff;
-  background-image: none;
-}
-.maintenance-page #name-and-slogan {
-  margin-bottom: 50px;
-  margin-left: 0;
-  padding-top: 20px;
-  font-size: 90%;
-}
-.maintenance-page #name-and-slogan,
-.maintenance-page #name-and-slogan a,
-.maintenance-page #name-and-slogan a:hover,
-.maintenance-page #name-and-slogan a:focus {
-  color: #777;
-}
-.maintenance-page  h1#page-title {
-  line-height: 1em;
-  margin-top: 0;
-}
-.maintenance-page #messages {
-  padding: 0;
-  margin-top: 30px;
-}
-.maintenance-page #messages div.messages {
-  margin: 0;
-}
-@media all and (min-width: 800px) {
-  .maintenance-page #page-wrapper {
-    width: 800px;
-  }
-  .maintenance-page #header div.section,
-  .maintenance-page #main {
-    width: 700px;
-  }
-  .maintenance-page #messages div.section {
-    padding: 0;
-    width: auto;
-  }
-}
-@media all and (min-width: 600px) { /* @TODO find the proper breakpoint */
-  .maintenance-page #page {
-    margin: 20px 40px 40px;
-  }
-}
only in patch2:
unchanged:
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -7,6 +7,10 @@ version: VERSION
 core: 8.x
 libraries:
   - bartik/base
+  - bartik/components
+  - bartik/layout
+  - bartik/theme
+  - bartik/print
 ckeditor_stylesheets:
   - css/ckeditor-iframe.css
 regions: