diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index 8d6f8f4..eb2704d 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -10,7 +10,6 @@ global-styling:
       css/components/breadcrumb.css: {}
       css/components/captions.css: {}
       css/components/comments.css: {}
-      css/components/content.css: {}
       css/components/contextual.css: {}
       # @see https://www.drupal.org/node/2389735
       css/components/dropbutton.component.css: {}
@@ -24,9 +23,11 @@ global-styling:
       css/components/item-list.css: {}
       css/components/list-group.css: {}
       css/components/list.css: {}
+      css/components/main-content.css: {}
       css/components/messages.css: {}
       css/components/node.css: {}
       css/components/node-preview.css: {}
+      css/components/page-title.css: {}
       css/components/pager.css: {}
       css/components/panel.css: {}
       css/components/primary-menu.css: {}
diff --git a/core/themes/bartik/css/components/block.css b/core/themes/bartik/css/components/block.css
index 33c3882..a1f2aca 100644
--- a/core/themes/bartik/css/components/block.css
+++ b/core/themes/bartik/css/components/block.css
@@ -3,6 +3,12 @@
  * Visual styles for Bartik's blocks.
  */
 
+/* Block has it's own content wrapper. */
+.content {
+  margin-top: 10px;
+}
+
+/* List in block. */
 .block ol,
 .block ul {
   margin: 0;
diff --git a/core/themes/bartik/css/components/content.css b/core/themes/bartik/css/components/content.css
deleted file mode 100644
index 1d4180e..0000000
--- a/core/themes/bartik/css/components/content.css
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's content component.
- */
-
-.content {
-  margin-top: 10px;
-}
-.page-title {
-  font-size: 2em;
-  line-height: 1em;
-}
-.main-content .section {
-  padding: 0 15px;
-}
-@media all and (min-width: 851px) {
-  .main-content {
-    float: left; /* LTR */
-    position: relative;
-  }
-  [dir="rtl"] .main-content {
-    float: right;
-  }
-  .layout-two-sidebars .main-content {
-    margin-left: 25%;
-    margin-right: 25%;
-    width: 50%;
-  }
-  .layout-one-sidebar .main-content {
-    width: 75%;
-  }
-  .layout-no-sidebars .main-content {
-    width: 100%;
-  }
-  .layout-sidebar-first .main-content {
-    margin-left: 25%; /* LTR */
-    margin-right: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-sidebar-first .main-content {
-    margin-left: 0;
-    margin-right: 25%;
-  }
-  .layout-sidebar-second .main-content {
-    margin-right: 25%; /* LTR */
-    margin-left: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-sidebar-second .main-content {
-    margin-right: 0;
-    margin-left: 25%;
-  }
-}
-
-.main-content h2 {
-  margin-bottom: 2px;
-  font-size: 1.429em;
-  line-height: 1.4;
-}
-.node__content {
-  font-size: 1.071em;
-}
-.node--view-mode-teaser .node__content {
-  font-size: 1em;
-}
-.node--view-mode-teaser h2 {
-  margin-top: 0;
-  padding-top: 0.5em;
-}
-.node--view-mode-teaser h2 a {
-  color: #181818;
-}
-.node--view-mode-teaser {
-  border-bottom: 1px solid #d3d7d9;
-  margin-bottom: 30px;
-  padding-bottom: 15px;
-}
-.node--view-mode-teaser.node--sticky {
-  background: #f9f9f9;
-  background: rgba(0, 0, 0, 0.024);
-  border: 1px solid #d3d7d9;
-  padding: 0 15px 15px;
-}
-.node--view-mode-teaser .node__content {
-  clear: none;
-  line-height: 1.6;
-}
-.node__meta {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 0.857em;
-  color: #68696b;
-  margin-bottom: -5px;
-}
-.node__meta .field-name-field-user-picture img {
-  float: left; /* LTR */
-  margin: 1px 20px 0 0; /* LTR */
-}
-[dir="rtl"] .node__meta .field-name-field-user-picture img {
-  float: right;
-  margin-left: 20px;
-  margin-right: 0;
-}
-.field-name-field-tags {
-  margin: 0 0 1.2em;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-.field-name-field-tags .field-label {
-  font-weight: normal;
-  margin: 0;
-  padding-right: 5px; /* LTR */
-}
-[dir="rtl"] .field-name-field-tags .field-label {
-  padding-left: 5px;
-  padding-right: 0;
-}
-.field-name-field-tags .field-label,
-.field-name-field-tags ul.links {
-  font-size: 0.8em;
-}
-.node--view-mode-teaser .field-name-field-tags .field-label,
-.node--view-mode-teaser .field-name-field-tags ul.links {
-  font-size: 0.821em;
-}
-.field-name-field-tags ul.links {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-.field-name-field-tags ul.links li {
-  float: left; /* LTR */
-  padding: 0 1em 0 0; /* LTR */
-  white-space: nowrap;
-}
-[dir="rtl"] .field-name-field-tags ul.links li {
-  padding: 0 0 0 1em;
-  float: right;
-}
-.node__links {
-  text-align: right; /* LTR */
-}
-[dir="rtl"] .node__links {
-  text-align: left;
-}
-@media all and (min-width: 560px) {
-  .node .field-type-image {
-    float: left; /* LTR */
-    margin: 0 1em 0 0; /* LTR */
-  }
-  [dir="rtl"] .node .field-type-image {
-    float: right;
-    margin: 0 0 0 1em;
-  }
-  .node .field-type-image + .field-type-image {
-    clear: both;
-  }
-}
-.field-type-image img,
-.field-name-field-user-picture img {
-  margin: 0 0 1em;
-}
-ul.links {
-  color: #68696b;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 0.821em;
-}
-.node--unpublished,
-.unpublished {
-  padding: 20px 15px 0;
-}
-.node-preview-container {
-  background: #d1e8f5;
-  background-image: -webkit-linear-gradient(top, #d1e8f5, #d3e8f4);
-  background-image: linear-gradient(to bottom, #d1e8f5, #d3e8f4);
-  font-family: Arial, sans-serif;
-  box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3333);
-  position: fixed;
-  z-index: 499;
-  width: 100%;
-  padding: 10px;
-}
-.node-preview-backlink {
-  background-color: #419ff1;
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, -webkit-linear-gradient(top, #419ff1, #1076d5);
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, linear-gradient(to bottom, #419ff1, #1076d5); /* LTR */
-  border: 1px solid #0048c8;
-  border-radius: .4em;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, .4);
-  color: #fff;
-  font-size: 0.9em;
-  line-height: normal;
-  margin: 0;
-  padding: 4px 1em 4px 0.6em; /* LTR */
-  text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5);
-}
-[dir="rtl"] .node-preview-backlink {
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, -webkit-linear-gradient(top, #419ff1, #1076d5);
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, linear-gradient(to bottom, #419ff1, #1076d5);
-  padding: 4px 0.6em 4px 1em;
-  float: right;
-}
-.node-preview-backlink:focus,
-.node-preview-backlink:hover {
-  background-color: #419cf1;
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, -webkit-linear-gradient(top, #59abf3, #2a90ef);
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, linear-gradient(to bottom, #59abf3, #2a90ef); /* LTR */
-  border: 1px solid #0048c8;
-  text-decoration: none;
-  color: #fff;
-}
-[dir="rtl"] .node-preview-backlink:focus,
-[dir="rtl"] .node-preview-backlink:hover {
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, -webkit-linear-gradient(top, #59abf3, #2a90ef);
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, linear-gradient(to bottom, #59abf3, #2a90ef);
-}
-.node-preview-backlink:active {
-  background-color: #0e69be;
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, -webkit-linear-gradient(top, #0e69be, #2a93ef);
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, linear-gradient(to bottom, #0e69be, #2a93ef); /* LTR */
-  border: 1px solid #0048c8;
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, .25);
-}
-.node-preview-backlink:active {
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, -webkit-linear-gradient(top, #0e69be, #2a93ef);
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, linear-gradient(to bottom, #0e69be, #2a93ef);
-}
-.node-preview-backlink::before {
-  content: '';
-  width: 10px;
-  display: inline-block;
-}
-.region-content ul,
-.region-content ol {
-  margin: 1em 0;
-  padding: 0 0 0.25em 15px; /* LTR */
-}
-[dir="rtl"] .region-content ul,
-[dir="rtl"] .region-content ol {
-  padding: 0 15px 0.25em 0;
-}
diff --git a/core/themes/bartik/css/components/field.css b/core/themes/bartik/css/components/field.css
index 774f8c3..66f07f9 100644
--- a/core/themes/bartik/css/components/field.css
+++ b/core/themes/bartik/css/components/field.css
@@ -38,12 +38,6 @@
   padding: 0 0 0 1em;
   float: right;
 }
-.node__links {
-  text-align: right; /* LTR */
-}
-[dir="rtl"] .node__links {
-  text-align: left;
-}
 @media all and (min-width: 560px) {
   .node .field-type-image {
     float: left; /* LTR */
@@ -61,3 +55,38 @@
 .field-name-field-user-picture img {
   margin: 0 0 1em;
 }
+.field-name-field-tags {
+  margin: 0 0 1.2em;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.field-name-field-tags .field-label {
+  font-weight: normal;
+  margin: 0;
+  padding-right: 5px; /* LTR */
+}
+[dir="rtl"] .field-name-field-tags .field-label {
+  padding-left: 5px;
+  padding-right: 0;
+}
+.field-name-field-tags .field-label,
+.field-name-field-tags ul.links {
+  font-size: 0.8em;
+}
+.node--view-mode-teaser .field-name-field-tags .field-label,
+.node--view-mode-teaser .field-name-field-tags ul.links {
+  font-size: 0.821em;
+}
+.field-name-field-tags ul.links {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+.field-name-field-tags ul.links li {
+  float: left; /* LTR */
+  padding: 0 1em 0 0; /* LTR */
+  white-space: nowrap;
+}
+[dir="rtl"] .field-name-field-tags ul.links li {
+  padding: 0 0 0 1em;
+  float: right;
+}
diff --git a/core/themes/bartik/css/components/main-content.css b/core/themes/bartik/css/components/main-content.css
new file mode 100644
index 0000000..2bc1004
--- /dev/null
+++ b/core/themes/bartik/css/components/main-content.css
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Visual styles for Bartik's content component.
+ */
+
+.main-content .section {
+  padding: 0 15px;
+}
+.main-content h2 {
+  margin-bottom: 2px;
+  font-size: 1.429em;
+  line-height: 1.4;
+}
+.main-content ul,
+.main-content ol {
+  margin: 1em 0;
+  padding: 0 0 0.25em 15px; /* LTR */
+}
+[dir="rtl"] .main-content ul,
+[dir="rtl"] .main-content ol {
+  padding: 0 15px 0.25em 0;
+}
diff --git a/core/themes/bartik/css/components/node.css b/core/themes/bartik/css/components/node.css
index baf1b72..207ab32 100644
--- a/core/themes/bartik/css/components/node.css
+++ b/core/themes/bartik/css/components/node.css
@@ -53,6 +53,14 @@
   margin-right: 0;
 }
 
+/* Node links styles. */
+.node__links {
+  text-align: right; /* LTR */
+}
+[dir="rtl"] .node__links {
+  text-align: left;
+}
+
 /* Unpublished node styles. */
 .node--unpublished {
   padding: 20px 15px 0;
diff --git a/core/themes/bartik/css/components/page-title.css b/core/themes/bartik/css/components/page-title.css
new file mode 100644
index 0000000..01de2fc
--- /dev/null
+++ b/core/themes/bartik/css/components/page-title.css
@@ -0,0 +1,9 @@
+/**
+ * @file
+ * Visual styles for Bartik's page-title component.
+ */
+
+.page-title {
+  font-size: 2em;
+  line-height: 1em;
+}
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 4e11f32..228b2c9 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -62,7 +62,6 @@
 }
 
 @media all and (min-width: 560px) and (max-width: 850px) {
-
   #sidebar-first,
   .region-featured-bottom-first,
   .region-featured-bottom-second,