diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index 6721678..4d66333 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -6,8 +6,8 @@ body {
 .comment .comment-arrow {
   border-color: #ffffff;
 }
-#page,
-#main-wrapper,
+.page,
+.main__wrapper,
 .region-primary-menu .menu li a.active,
 .region-primary-menu .menu li .active-trail a {
   background: #ffffff;
@@ -19,7 +19,7 @@ body {
   background-color: #ffffff;
   border-bottom: 1px solid #ffffff;
 }
-#header {
+.header {
   background-color: #1d84c3;
   background-image: -webkit-linear-gradient(top, #055a8e 0%, #1d84c3 100%);
   background-image: linear-gradient(to bottom, #055a8e 0%, #1d84c3 100%);
@@ -42,16 +42,16 @@ a:active,
   background-color: #f6f6f2;
   border-color: #f9f9f9;
 }
-#page-wrapper,
-#footer-wrapper {
+.page__wrapper,
+.footer__wrapper {
   background: #292929;
 }
 .region-header,
 .region-header a,
 .region-header li a.active,
-#name-and-slogan,
+.name-and-slogan,
 .site-branding-block,
-#name-and-slogan a,
+.name-and-slogan a,
 .site-branding-block a,
 .region-secondary-menu .menu li a {
   color: #fffeff;
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 1e2654c..da1f71a 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -3,25 +3,25 @@
 
 html,
 body,
-#page  {
+.page  {
   height: 100%;
 }
-#page-wrapper {
+.page__wrapper {
   min-height: 100%;
 }
-#header div.section,
-#featured div.section,
-#messages div.section,
-#main,
-#triptych,
-#footer-columns,
-#footer {
+.header div.section,
+.featured div.section,
+.messages__wrapper div.section,
+.main,
+.triptych,
+.footer-columns,
+.footer {
   width: 100%;
   max-width: 860px;
   margin-left: auto;
   margin-right: auto;
 }
-#header div.section {
+.header div.section {
   position: relative;
 }
 .region-header {
@@ -37,20 +37,20 @@ body,
   margin: 0 auto;
   overflow: hidden;
 }
-#main-wrapper {
+.main__wrapper {
   min-height: 300px;
 }
-#content .section,
+.content .section,
 .sidebar .section {
   padding: 0 15px;
 }
 .breadcrumb {
   margin: 0 15px;
 }
-#footer-wrapper {
+.footer__wrapper {
   padding: 35px 0 30px;
 }
-#footer-wrapper .section {
+.footer__wrapper .section {
   box-sizing: border-box;
   padding: 0 15px;
 }
@@ -70,7 +70,7 @@ body,
 
 @media all and (min-width: 560px) and (max-width: 850px) {
 
-  #sidebar-first,
+  .sidebar-first,
   .region-triptych-first,
   .region-triptych-middle,
   .region-triptych-last,
@@ -82,7 +82,7 @@ body,
     float: left; /* LTR */
     position: relative;
   }
-  [dir="rtl"] #sidebar-first,
+  [dir="rtl"] .sidebar-first,
   [dir="rtl"] .region-triptych-first,
   [dir="rtl"] .region-triptych-middle,
   [dir="rtl"] .region-triptych-last,
@@ -92,24 +92,24 @@ body,
   [dir="rtl"] .region-footer-fourthcolumn {
     float: right;
   }
-  #sidebar-first,
-  #sidebar-second {
+  .sidebar-first,
+  .sidebar-second {
     width: 50%;
   }
-  #sidebar-second {
+  .sidebar-second {
     margin-left: 50%; /* LTR */
   }
-  [dir="rtl"] #sidebar-second {
+  [dir="rtl"] .sidebar-second {
     margin-right: 50%;
   }
-  .one-sidebar #sidebar-first,
-  .one-sidebar #sidebar-second {
+  .one-sidebar .sidebar-first,
+  .one-sidebar .sidebar-second {
     width: 100%;
   }
-  .one-sidebar #sidebar-second {
+  .one-sidebar .sidebar-second {
     margin-left: 0; /* LTR */
   }
-  [dir="rtl"] .one-sidebar #sidebar-second {
+  [dir="rtl"] .one-sidebar .sidebar-second {
     margin-right: 0;
   }
   .region-triptych-first,
@@ -141,18 +141,18 @@ body,
 
 @media all and (min-width: 851px) {
 
-  #header div.section,
-  #featured div.section,
-  #messages div.section,
-  #main,
-  #triptych,
-  #footer-columns,
-  #footer {
+  .header div.section,
+  .featured div.section,
+  .messages__wrapper div.section,
+  .main,
+  .triptych,
+  .footer-columns,
+  .footer {
     max-width: 1290px;
   }
-  #content,
-  #sidebar-first,
-  #sidebar-second,
+  .content,
+  .sidebar-first,
+  .sidebar-second,
   .region-triptych-first,
   .region-triptych-middle,
   .region-triptych-last,
@@ -164,9 +164,9 @@ body,
     float: left; /* LTR */
     position: relative;
   }
-  [dir="rtl"] #content,
-  [dir="rtl"] #sidebar-first,
-  [dir="rtl"] #sidebar-second,
+  [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,
@@ -176,46 +176,46 @@ body,
   [dir="rtl"] .region-footer-fourthcolumn {
     float: right;
   }
-  .layout-two-sidebars #content {
+  .layout-two-sidebars .content {
     margin-left: 25%;
     margin-right: 25%;
     width: 50%;
   }
-  .layout-one-sidebar #content {
+  .layout-one-sidebar .content {
     width: 75%;
   }
-  .layout-no-sidebars #content {
+  .layout-no-sidebars .content {
     width: 100%;
   }
-  .layout-sidebar-first #content {
+  .layout-sidebar-first .content {
     margin-left: 25%; /* LTR */
     margin-right: 0; /* LTR */
   }
-  [dir="rtl"] .layout-sidebar-first #content {
+  [dir="rtl"] .layout-sidebar-first .content {
     margin-left: 0;
     margin-right: 25%;
   }
-  .layout-sidebar-second #content {
+  .layout-sidebar-second .content {
     margin-right: 25%; /* LTR */
     margin-left: 0; /* LTR */
   }
-  [dir="rtl"] .layout-sidebar-second #content {
+  [dir="rtl"] .layout-sidebar-second .content {
     margin-right: 0;
     margin-left: 25%;
   }
-  #sidebar-first {
+  .sidebar-first {
     width: 25%;
     margin-left: -100%; /* LTR */
   }
-  [dir="rtl"] #sidebar-first {
+  [dir="rtl"] .sidebar-first {
     margin-right: -100%;
   }
-  #sidebar-second {
+  .sidebar-second {
     width: 25%;
     margin-left: -25%; /* LTR */
     clear: none;
   }
-  [dir="rtl"] #sidebar-second {
+  [dir="rtl"] .sidebar-second {
     margin-right: -25%;
   }
   .region-triptych-first,
diff --git a/core/themes/bartik/css/maintenance-page.css b/core/themes/bartik/css/maintenance-page.css
index ce5c9f5..662efbb 100644
--- a/core/themes/bartik/css/maintenance-page.css
+++ b/core/themes/bartik/css/maintenance-page.css
@@ -2,7 +2,7 @@ body.maintenance-page {
   background-color: #fff;
   color: #000;
 }
-.maintenance-page #page-wrapper {
+.maintenance-page .page__wrapper {
   background: #fff;
   margin-left: auto;
   margin-right: auto;
@@ -11,64 +11,64 @@ body.maintenance-page {
   border: 1px solid #ddd;
   margin-top: 40px;
 }
-.maintenance-page #page {
+.maintenance-page .page {
   margin: 10px;
 }
-.maintenance-page #main-wrapper {
+.maintenance-page .main__wrapper {
   min-height: inherit;
 }
-.maintenance-page #header,
-.maintenance-page #messages {
+.maintenance-page .header,
+.maintenance-page .messages__wrapper {
   width: auto;
 }
-.maintenance-page #main {
+.maintenance-page .main {
   margin: 0;
 }
-.maintenance-page #content .section {
+.maintenance-page .content .section {
   padding: 0 0 0 10px;
 }
-.maintenance-page #header {
+.maintenance-page .header {
   background-color: #fff;
   background-image: none;
 }
-.maintenance-page #name-and-slogan {
+.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 {
+.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 {
+.maintenance-page  h1.page__title {
   line-height: 1em;
   margin-top: 0;
 }
-.maintenance-page #messages {
+.maintenance-page .messages__wrapper {
   padding: 0;
   margin-top: 30px;
 }
-.maintenance-page #messages div.messages {
+.maintenance-page .messages__wrapper div.messages {
   margin: 0;
 }
 @media all and (min-width: 800px) {
-  .maintenance-page #page-wrapper {
+  .maintenance-page .page__wrapper {
     width: 800px;
   }
-  .maintenance-page #header div.section,
-  .maintenance-page #main {
+  .maintenance-page .header div.section,
+  .maintenance-page .main {
     width: 700px;
   }
-  .maintenance-page #messages div.section {
+  .maintenance-page .messages__wrapper div.section {
     padding: 0;
     width: auto;
   }
 }
 @media all and (min-width: 600px) { /* @TODO find the proper breakpoint */
-  .maintenance-page #page {
+  .maintenance-page .page {
     margin: 20px 40px 40px;
   }
 }
diff --git a/core/themes/bartik/css/print.css b/core/themes/bartik/css/print.css
index fbe386a..a4eb46a 100644
--- a/core/themes/bartik/css/print.css
+++ b/core/themes/bartik/css/print.css
@@ -14,11 +14,11 @@ body.sidebar-second,
 body {
   width: 640px;
 }
-#sidebar-first,
-#sidebar-second,
+.sidebar-first,
+.sidebar-second,
 .navigation,
-#toolbar,
-#footer-wrapper,
+.toolbar,
+.footer__wrapper,
 .tabs,
 .add-or-remove-shortcuts {
   display: none;
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index e53c10d..13b51d0 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -111,16 +111,15 @@ pre {
 /* ------------------ Fonts ------------------ */
 
 body,
-#site-slogan,
-.site-slogan,
-#page .ui-widget,
+.site__slogan,
+.page .ui-widget,
 .comment-form label,
 .node-form label,
 .node-form .description {
   font-family: Georgia, "Times New Roman", Times, serif;
 }
-#header,
-#footer-wrapper,
+.header,
+.footer__wrapper,
 .skip-link,
 ul.contextual-links,
 ul.links,
@@ -203,7 +202,7 @@ table {
 table table {
   font-size: 1em;
 }
-#footer-wrapper table {
+.footer__wrapper table {
   font-size: 1em;
 }
 tr {
@@ -244,8 +243,8 @@ tr th {
 [dir="rtl"] tr th {
   text-align: right;
 }
-#footer-wrapper tr td,
-#footer-wrapper tr th {
+.footer__wrapper tr td,
+.footer__wrapper tr th {
   border-color: #555;
   border-color: rgba(255, 255, 255, 0.18);
 }
@@ -352,43 +351,39 @@ ul.tips {
 .skip-link:focus {
   outline: 0;
 }
-#logo,
+.logo,
 .site-logo {
   float: left; /* LTR */
   padding-left: 5px; /* LTR */
 }
-[dir="rtl"] #logo,
+[dir="rtl"] .logo,
 [dir="rtl"] .site-logo {
   padding: 15px 10px 15px 15px;
 }
 
-#name-and-slogan,
+.name-and-slogan,
 .site-branding-text {
   float: left; /* LTR */
   margin: 0;
   padding: 5px 10px 8px;
 }
-[dir="rtl"] #name-and-slogan,
+[dir="rtl"] .name-and-slogan,
 [dir="rtl"] .site-branding-text {
   margin: 0 15px 30px 0;
 }
 
-#site-name,
-.site-name {
+.site__name {
   font-size: 1.6em;
   color: #686868;
   line-height: 1;
 }
-h1#site-name,
-h1.site-name {
+h1.site__name {
   margin: 0;
 }
-#site-name a,
-.site-name a {
+.site__name a {
   font-weight: normal;
 }
-#site-slogan,
-.site-slogan {
+.site__slogan {
   font-size: 0.929em;
   margin-top: 7px;
   word-spacing: 0.1em;
@@ -537,9 +532,9 @@ h1.site-name {
   padding: 0 0.5em;
 }
 
-[dir="rtl"] #logo,
+[dir="rtl"] .logo,
 [dir="rtl"] .site-logo,
-[dir="rtl"] #name-and-slogan,
+[dir="rtl"] .name-and-slogan,
 [dir="rtl"] .site-branding-text,
 [dir="rtl"] .region-header .block,
 [dir="rtl"] .region-header #block-user-login .form-item,
@@ -677,14 +672,14 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l
 
 /* ------------------- Main ------------------- */
 
-#main {
+.main {
   margin-top: 20px;
   margin-bottom: 40px;
 }
 
 /* ----------------- Featured ----------------- */
 
-#featured {
+.featured {
   text-align: center;
   font-size: 1.2em;
   font-weight: normal;
@@ -696,18 +691,18 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l
   border-bottom: 1px solid #e7e7e7;
   text-shadow: 1px 1px #fff;
 }
-#featured h2 {
+.featured h2 {
   font-size: 1.2em;
   line-height: 1;
 }
-#featured p {
+.featured p {
   margin: 0;
   padding: 0;
 }
 
 /* --------------- Highlighted ---------------- */
 
-#highlighted {
+.highlighted {
   border-bottom: 1px solid #d3d7d9;
   font-size: 120%;
 }
@@ -726,11 +721,11 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l
 .node__content {
   margin-top: 10px;
 }
-h1#page-title {
+h1.page-title {
   font-size: 2em;
   line-height: 1;
 }
-#content h2 {
+.content h2 {
   margin-bottom: 2px;
   font-size: 1.429em;
   line-height: 1.4;
@@ -1037,12 +1032,12 @@ ul.links {
 
 /* ----------------- Triptych ----------------- */
 
-#triptych-wrapper {
+.triptych__wrapper {
   background-color: #f0f0f0;
   background: rgba(30, 50, 10, 0.08);
   border-top: 1px solid #e7e7e7;
 }
-#triptych h2 {
+.triptych h2 {
   color: #000;
   font-size: 1.4em;
   margin-bottom: 0.6em;
@@ -1050,93 +1045,93 @@ ul.links {
   text-align: center;
   line-height: 1;
 }
-#triptych .block {
+.triptych .block {
   margin-bottom: 1em;
   padding-bottom: 1em;
   border-bottom: 1px solid #dfdfdf;
   line-height: 1.3;
 }
-#triptych .block:last-child {
+.triptych .block:last-child {
   border-bottom: none;
 }
-#triptych .block ul li,
-#triptych .block ol li {
+.triptych .block ul li,
+.triptych .block ol li {
   list-style: none;
 }
-#triptych .block ul,
-#triptych .block ol {
+.triptych .block ul,
+.triptych .block ol {
   padding-left: 0;
 }
-#triptych #block-user-login .form-text {
+.triptych #block-user-login .form-text {
   width: 185px;
 }
-#triptych #block-user-online p {
+.triptych #block-user-online p {
   margin-bottom: 0;
 }
-#triptych #block-node-syndicate h2 {
+.triptych #block-node-syndicate h2 {
   overflow: hidden;
   width: 0;
   height: 0;
 }
-#triptych-last #block-node-syndicate {
+.triptych-last #block-node-syndicate {
   text-align: right;
 }
-#triptych #block-search-form .form-type-search input {
+.triptych #block-search-form .form-type-search input {
   width: 185px;
 }
-#triptych-middle #block-system-powered-by {
+.triptych-middle #block-system-powered-by {
   text-align: center;
 }
-#triptych-last #block-system-powered-by {
+.triptych-last #block-system-powered-by {
   text-align: right;
 }
 
 /* ------------------ Footer ------------------ */
 
-#footer-wrapper .block .content {
+.footer__wrapper .block .content {
   color: #c0c0c0;
   color: rgba(255, 255, 255, 0.65);
   font-size: 0.857em;
 }
-#footer-wrapper .block .content a {
+.footer__wrapper .block .content a {
   color: #fcfcfc;
   color: rgba(255, 255, 255, 0.8);
 }
-#footer-wrapper .block .content a:hover,
-#footer-wrapper .block .content a:focus {
+.footer__wrapper .block .content a:hover,
+.footer__wrapper .block .content a:focus {
   color: #fefefe;
   color: rgba(255, 255, 255, 0.95);
 }
-#footer-wrapper .block {
+.footer__wrapper .block {
   margin: 20px 0;
   border: 1px solid #444;
   border-color: rgba(255, 255, 255, 0.1);
   padding: 10px;
 }
-#footer-columns .block-menu,
-#footer .block {
+.footer__columns .block-menu,
+.footer .block {
   margin: 0;
   padding: 0;
   border: none;
 }
-#footer .block {
+.footer .block {
   margin: 0.5em 0;
 }
-#footer .block .content {
+.footer .block .content {
   padding: 0.5em 0;
   margin-top: 0;
 }
-#footer .block > h2 {
+.footer .block > h2 {
   /* @extend .visually-hidden */
   position: absolute !important;
   clip: rect(1px, 1px, 1px, 1px);
   overflow: hidden;
   height: 1px;
 }
-#footer .block h2 {
+.footer .block h2 {
   margin: 0;
 }
-#footer-columns h2 {
+.footer-columns h2 {
   border-bottom: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
   font-size: 1em;
@@ -1144,26 +1139,26 @@ ul.links {
   padding-bottom: 3px;
   text-transform: uppercase;
 }
-#footer-columns .content {
+.footer-columns .content {
   margin-top: 0;
 }
-#footer-columns p {
+.footer-columns p {
   margin-top: 1em;
 }
-#footer-columns .content ul {
+.footer-columns .content ul {
   list-style: none;
   padding-left: 0; /* LTR */
   margin-left: 0;
 }
-[dir="rtl"] #footer-columns .content ul {
+[dir="rtl"] .footer-columns .content ul {
   padding-right: 0;
 }
-#footer-columns .content li {
+.footer-columns .content li {
   list-style: none;
   margin: 0;
   padding: 0;
 }
-#footer-columns .content li a {
+.footer-columns .content li a {
   display: block;
   border-bottom: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
@@ -1171,66 +1166,66 @@ ul.links {
   padding: 0.8em 2px 0.8em 20px; /* LTR */
   text-indent: -15px;
 }
-[dir="rtl"] #footer-columns .content li a {
+[dir="rtl"] .footer-columns .content li a {
   padding: 0.8em 20px 0.8em 2px;
 }
-#footer-columns .content li a:hover,
-#footer-columns .content li a:focus {
+.footer-columns .content li a:hover,
+.footer-columns .content li a:focus {
   background-color: #1f1f21;
   background-color: rgba(255, 255, 255, 0.05);
   text-decoration: none;
 }
-#footer {
+.footer {
   letter-spacing: 0.2px;
   margin-top: 30px;
   border-top: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
 }
-#footer .region {
+.footer .region {
   margin-top: 20px;
 }
-#footer .block {
+.footer .block {
   clear: both;
 }
-#footer .menu ,
-#footer .menu li {
+.footer .menu ,
+.footer .menu li {
   list-style: none;
   margin: 0;
   padding: 0;
 }
-#footer .menu li a {
+.footer .menu li a {
   float: left; /* LTR */
   padding: 0 12px;
   display: block;
   border-right: 1px solid #555; /* LTR */
   border-color: rgba(255, 255, 255, 0.15);
 }
-[dir="rtl"] #footer .menu li a {
+[dir="rtl"] .footer .menu li a {
   float: right;
   border-left: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
   border-right: none;
 }
-#footer .menu li:first-child a {
+.footer .menu li:first-child a {
   padding-left: 0; /* LTR */
 }
-[dir="rtl"] #footer .menu li:first-child a {
+[dir="rtl"] .footer .menu li:first-child a {
   padding-right: 0;
   padding-left: 12px;
 }
-#footer .menu li:last-child a {
+.footer .menu li:last-child a {
   padding-right: 0; /* LTR */
   border-right: none; /* LTR */
 }
-[dir="rtl"] #footer .menu li:last-child a {
+[dir="rtl"] .footer .menu li:last-child a {
   padding-left: 0;
   padding-right: 12px;
   border-left: none;
 }
-#footer-wrapper tr.odd {
+.footer__wrapper tr.odd {
   background-color: transparent;
 }
-#footer-wrapper tr.even {
+.footer__wrapper tr.even {
   background-color: #2c2c2c;
   background-color: rgba(0, 0, 0, 0.15);
 }
@@ -1330,11 +1325,11 @@ div.tabs {
 
 /* ---------------- Messages  ----------------- */
 
-#messages {
+.messages__wrapper {
   padding: 20px 0 5px;
   margin: 0 auto;
 }
-.featured #messages {
+.featured .messages__wrapper {
   background: #f0f0f0;
   background: rgba(30, 50, 10, 0.08);
 }
@@ -1602,7 +1597,7 @@ ul.vertical-tabs-list {
   line-height: 1.2;
   margin-left: 120px; /* LTR */
 }
-#content h2.comment-form {
+.content h2.comment-form {
   margin-bottom: 0.5em;
 }
 .comment-form .form-textarea {
@@ -1768,13 +1763,13 @@ ol.search-results {
 /* -------------- Shortcut Links -------------- */
 
 .shortcut-wrapper {
-  margin: 2.2em 0 1.1em 0; /* Same as usual h1#page-title margin. */
+  margin: 2.2em 0 1.1em 0; /* Same as usual h1.page__title margin. */
 }
-.shortcut-wrapper h1#page-title {
+.shortcut-wrapper h1.page__title {
   float: left; /* LTR */
   margin: 0;
 }
-[dir="rtl"] .shortcut-wrapper h1#page-title {
+[dir="rtl"] .shortcut-wrapper h1.page__title {
   float: right;
 }
 div.add-or-remove-shortcuts {
@@ -1783,10 +1778,10 @@ div.add-or-remove-shortcuts {
 
 /* ---------- Admin-specific Theming ---------- */
 
-.page-admin #content img {
+.page-admin .content img {
   margin-right: 15px; /* LTR */
 }
-.page-admin #content .simpletest-image img {
+.page-admin .content .simpletest-image img {
   margin: 0;
 }
 .page-admin-structure-block-demo .block-region {
@@ -1799,10 +1794,10 @@ div.add-or-remove-shortcuts {
   text-align: center;
   text-shadow: none;
 }
-.page-admin-structure-block-demo #featured .block-region {
+.page-admin-structure-block-demo .featured .block-region {
   font-size: 0.55em;
 }
-.page-admin-structure-block-demo #header .block-region {
+.page-admin-structure-block-demo .header .block-region {
   width: 500px;
 }
 .page-admin #admin-dblog img {
@@ -1868,15 +1863,15 @@ div.admin-panel .description {
  .region-header {
     margin: .5em 5px .75em;
   }
-  #logo,
+  .logo,
   .site-logo {
     padding: 5px 0 0 5px; /* LTR */
   }
-  [dir="rtl"] #logo,
+  [dir="rtl"] .logo,
   [dir="rtl"] .site-logo {
     padding: 5px 5px 0 0;
   }
-  #name-and-slogan,
+  .name-and-slogan,
   .site-branding-text {
     padding: 10px 10px 8px;
   }
@@ -1924,25 +1919,24 @@ div.admin-panel .description {
   .region-header {
     margin: 1em 5px 1.5em;
   }
-  #logo,
+  .logo,
   .site-logo {
     padding: 15px 15px 15px 10px; /* LTR */
   }
-  [dir="rtl"] #logo,
+  [dir="rtl"] .logo,
   [dir="rtl"] .site-logo {
     padding: 15px 10px 15px 15px;
   }
-  #name-and-slogan,
+  .name-and-slogan,
   .site-branding-text {
     padding: 26px 0 0;
     margin: 0 0 30px 15px; /* LTR */
   }
-  [dir="rtl"] #name-and-slogan,
+  [dir="rtl"] .name-and-slogan,
   [dir="rtl"] .site-branding-text {
     margin: 0 15px 30px 0;
   }
-  #site-name,
-  .site-name {
+  .site__name {
     font-size: 1.821em;
   }
   .region-primary-menu .block-menu .menu {
@@ -1988,19 +1982,19 @@ div.admin-panel .description {
 @media all and (min-width: 520px) {
 
   /* ----------------- Featured ----------------- */
-  #featured {
+  .featured {
     font-size: 1.643em;
   }
-  #featured h2 {
+  .featured h2 {
     font-size: 1.174em;
   }
 
   /* ------------------ Triptych ----------------- */
-  #triptych h2 {
+  .triptych h2 {
     font-size: 1.714em;
     margin-bottom: 0.9em;
   }
-  #triptych .block {
+  .triptych .block {
     margin-bottom: 2em;
     padding-bottom: 2em;
   }
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 5de50cc..1aac3f1 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -8,38 +8,38 @@
  * @see template_preprocess_maintenance_page()
  */
  #}
-  <div id="page-wrapper"><div id="page">
+  <div class="page__wrapper"><div class="page">
 
-    <header id="header" role="banner"><div class="section clearfix">
+    <header class="header" role="banner"><div class="section clearfix">
       {% if site_name or site_slogan %}
-        <div id="name-and-slogan"{{ hide_site_name and hide_site_slogan ? ' class="visually-hidden"' }}>
+        <div class="name-and-slogan{{ hide_site_name and hide_site_slogan ? ' visually-hidden' }}">
           {% if site_name %}
-            <div id="site-name"{{ hide_site_name ? ' class="visually-hidden"' }}>
+            <div class="site__name{{ hide_site_name ? ' visually-hidden' }}">
               <strong>
                 <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
               </strong>
             </div>
           {% endif %}
           {% if site_slogan %}
-            <div id="site-slogan"{{ hide_site_slogan ? ' class="visually-hidden"' }}>
+            <div class="site__slogan"{{ hide_site_slogan ? ' visually-hidden' }}">
               {{ site_slogan }}
             </div>
           {% endif %}
-        </div> <!-- /#name-and-slogan -->
+        </div> <!-- /.name-and-slogan -->
       {% endif %}
-    </div></header> <!-- /.section, /#header -->
+    </div></header> <!-- /.section, /.header -->
 
-    <div id="main-wrapper"><div id="main" class="clearfix">
-      <main id="content" class="column" role="main"><section class="section">
-        <a id="main-content"></a>
-        {% if title %}<h1 class="title" id="page-title">{{ title }}</h1>{% endif %}
+    <div class="main__wrapper"><div class="main clearfix">
+      <main class="content column" role="main"><section class="section">
+        <a class="main-content"></a>
+        {% if title %}<h1 class="title page__title">{{ title }}</h1>{% endif %}
         {{ page.content }}
         {% if messages %}
-          <div id="messages"><div class="section clearfix">
+          <div class="messages_wrapper"><div class="section clearfix">
             {{ messages }}
-          </div></div> <!-- /.section, /#messages -->
+          </div></div> <!-- /.section, /.messages_wrapper -->
         {% endif %}
-      </section></main> <!-- /.section, /#content -->
-    </div></div> <!-- /#main, /#main-wrapper -->
+      </section></main> <!-- /.section, /.content -->
+    </div></div> <!-- /.main, /.main__wrapper -->
 
-  </div></div> <!-- /#page, /#page-wrapper -->
+  </div></div> <!-- /.page, /.page__wrapper -->
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index d52d3db..3105cb2 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -76,69 +76,69 @@
  * @see html.html.twig
  */
 #}
-<div id="page-wrapper"><div id="page">
+<div class="page__wrapper"><div class="page">
 
-  <header id="header" role="banner" aria-label="{{ 'Site header'|t}}"><div class="section clearfix">
+  <header class="header" role="banner" aria-label="{{ 'Site header'|t}}"><div class="section clearfix">
 
     {{ page.secondary_menu }}
 
     {% if logo %}
-      <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
+      <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" class="logo">
         <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
       </a>
     {% endif %}
 
     {% if site_name or site_slogan %}
-      <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
+      <div class="name-and-slogan{% if hide_site_name and hide_site_slogan %} visually-hidden{% endif %}">
         {% if site_name %}
           {% if title %}
-            <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
+            <div class="site__name{% if hide_site_name %} visually-hidden{% endif %}">
               <strong>
                 <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
               </strong>
             </div>
           {# Use h1 when the content title is empty #}
           {% else %}
-            <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
+            <h1 class="site__name{% if hide_site_name %} visually-hidden{% endif %}">
               <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
             </h1>
           {% endif %}
         {% endif %}
 
         {% if site_slogan %}
-          <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
+          <div class="site__slogan{% if hide_site_slogan %} visually-hidden{% endif %}">
             {{ site_slogan }}
           </div>
         {% endif %}
-      </div><!-- /#name-and-slogan -->
+      </div><!-- /.name-and-slogan -->
     {% endif %}
 
     {{ page.header }}
     {{ page.primary_menu }}
 
-  </div></header> <!-- /.section, /#header-->
+  </div></header> <!-- /.section, /.header-->
 
   {% if messages %}
-    <div id="messages"><div class="section clearfix">
+    <div class="messages__wrapper"><div class="section clearfix">
       {{ messages }}
-    </div></div> <!-- /.section, /#messages -->
+    </div></div> <!-- /.section, /.messages__wrapper -->
   {% endif %}
 
   {% if page.featured %}
-    <aside id="featured"><div class="section clearfix">
+    <aside class="featured"><div class="section clearfix">
       {{ page.featured }}
-    </div></aside> <!-- /.section, /#featured -->
+    </div></aside> <!-- /.section, /.featured -->
   {% endif %}
 
-  <div id="main-wrapper" class="clearfix"><div id="main" class="clearfix">
+  <div class="main__wrapper clearfix"><div class="main clearfix">
     {{ breadcrumb }}
 
-    <main id="content" class="column" role="main"><section class="section">
-      {% if page.highlighted %}<div id="highlighted">{{ page.highlighted }}</div>{% endif %}
-      <a id="main-content" tabindex="-1"></a>
+    <main class="content column" role="main"><section class="section">
+      {% if page.highlighted %}<div class="highlighted">{{ page.highlighted }}</div>{% endif %}
+      <a class="main-content" tabindex="-1"></a>
       {{ title_prefix }}
         {% if title %}
-          <h1 class="title" id="page-title">
+          <h1 class="title page__title">
             {{ title }}
           </h1>
         {% endif %}
@@ -156,47 +156,47 @@
         {% endif %}
       {{ page.content }}
       {{ feed_icons }}
-    </section></main> <!-- /.section, /#content -->
+    </section></main> <!-- /.section, /.content -->
 
     {% if page.sidebar_first %}
-      <div id="sidebar-first" class="column sidebar"><aside class="section">
+      <div class="sidebar-first column sidebar"><aside class="section">
         {{ page.sidebar_first }}
-      </aside></div><!-- /.section, /#sidebar-first -->
+      </aside></div><!-- /.section, /.sidebar-first -->
     {% endif %}
 
     {% if page.sidebar_second %}
-      <div id="sidebar-second" class="column sidebar"><aside class="section">
+      <div class="sidebar-second column sidebar"><aside class="section">
         {{ page.sidebar_second }}
-      </aside></div><!-- /.section, /#sidebar-second -->
+      </aside></div><!-- /.section, /.sidebar-second -->
     {% endif %}
 
-  </div></div><!-- /#main, /#main-wrapper -->
+  </div></div><!-- /.main, /.main__wrapper -->
 
   {% if page.triptych_first or page.triptych_middle or page.triptych_last %}
-    <div id="triptych-wrapper"><aside id="triptych" class="clearfix">
+    <div class="triptych__wrapper"><aside class="triptych clearfix">
       {{ page.triptych_first }}
       {{ page.triptych_middle }}
       {{ page.triptych_last }}
-    </aside></div><!-- /#triptych, /#triptych-wrapper -->
+    </aside></div><!-- /#triptych, /.triptych__wrapper -->
   {% endif %}
 
-  <div id="footer-wrapper"><footer class="section">
+  <div class="footer__wrapper"><footer class="section">
 
     {% if page.footer_firstcolumn or page.footer_secondcolumn or page.footer_thirdcolumn or page.footer_fourthcolumn %}
-      <div id="footer-columns" class="clearfix">
+      <div class="footer-columns clearfix">
         {{ page.footer_firstcolumn }}
         {{ page.footer_secondcolumn }}
         {{ page.footer_thirdcolumn }}
         {{ page.footer_fourthcolumn }}
-      </div><!-- /#footer-columns -->
+      </div><!-- /.footer-columns -->
     {% endif %}
 
     {% if page.footer %}
-      <div id="footer" role="contentinfo" class="clearfix">
+      <div class="footer clearfix" role="contentinfo">
         {{ page.footer }}
-      </div> <!-- /#footer -->
+      </div> <!-- /.footer -->
    {% endif %}
 
-  </footer></div> <!-- /.section, /#footer-wrapper -->
+  </footer></div> <!-- /.section, /.footer__wrapper -->
 
-</div></div> <!-- /#page, /#page-wrapper -->
+</div></div> <!-- /.page, /.page__wrapper -->
