diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index 9f40ef6..59b4605 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -10,6 +10,7 @@ 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: {}
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index f6b0041..52f7625 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -48,7 +48,7 @@ body,
 #main-wrapper {
   min-height: 300px;
 }
-.content .section,
+.main-content .section,
 .sidebar .section {
   padding: 0 15px;
 }
@@ -152,7 +152,7 @@ body,
   #site-footer__bottom {
     max-width: 1290px;
   }
-  .content,
+  .main-content,
   #sidebar-first,
   #sidebar-second,
   .region-featured-bottom-first,
@@ -166,7 +166,7 @@ body,
     float: left; /* LTR */
     position: relative;
   }
-  [dir="rtl"] .content,
+  [dir="rtl"] .main-content,
   [dir="rtl"] #sidebar-first,
   [dir="rtl"] #sidebar-second,
   [dir="rtl"] .region-featured-bottom-first,
@@ -178,30 +178,30 @@ body,
   [dir="rtl"] .region-footer-fourth {
     float: right;
   }
-  .layout-two-sidebars .content {
+  .layout-two-sidebars .main-content {
     margin-left: 25%;
     margin-right: 25%;
     width: 50%;
   }
-  .layout-one-sidebar .content {
+  .layout-one-sidebar .main-content {
     width: 75%;
   }
-  .layout-no-sidebars .content {
+  .layout-no-sidebars .main-content {
     width: 100%;
   }
-  .layout-sidebar-first .content {
+  .layout-sidebar-first .main-content {
     margin-left: 25%; /* LTR */
     margin-right: 0; /* LTR */
   }
-  [dir="rtl"] .layout-sidebar-first .content {
+  [dir="rtl"] .layout-sidebar-first .main-content {
     margin-left: 0;
     margin-right: 25%;
   }
-  .layout-sidebar-second .content {
+  .layout-sidebar-second .main-content {
     margin-right: 25%; /* LTR */
     margin-left: 0; /* LTR */
   }
-  [dir="rtl"] .layout-sidebar-second .content {
+  [dir="rtl"] .layout-sidebar-second .main-content {
     margin-right: 0;
     margin-left: 25%;
   }
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 931c71d..ed2ddcc 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -124,12 +124,12 @@
     <div id="main-wrapper" class="clearfix">
       <div id="main" class="clearfix">
         {{ page.breadcrumb }}
-        <main class="content column" role="main">
+        <main class="main-content column" role="main">
           <section class="section">
-            <a class="main-content" tabindex="-1"></a>
+            <a id="main-content" tabindex="-1"></a>
             {{ title_prefix }}
             {% if title %}
-              <h1 class="title" class="page-title">
+              <h1 class="title page-title">
                 {{ title }}
               </h1>
             {% endif %}