diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index cb1bcb1..e0a26f7 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -6,7 +6,7 @@ package: Core
 version: VERSION
 core: 8.x
 libraries:
-  - bartik/global-styling
+  - bartik/global_styling
 ckeditor_stylesheets:
   - css/ckeditor-iframe.css
 regions:
diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index d386f29..04276cb 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -1,16 +1,13 @@
-global-styling:
+global_styling:
   version: VERSION
   css:
     theme:
-      # Base
       css/base/elements.css: {}
       css/base/typography.css: {}
-      # Components
       css/components/admin.css: {}
       css/components/book.css: {}
       css/components/breadcrumb.css: {}
       css/components/captions.css: {}
-      css/components/colors.css: {}
       css/components/comments.css: {}
       css/components/content.css: {}
       css/components/dropbutton.css: {}
@@ -40,9 +37,8 @@ global-styling:
       css/components/views.css: {}
       css/components/buttons.css: {}
       css/components/media.css: {}
-      # Layout
-      css/layout/layout.css: {}
-      # Print
+      css/colors.css: {}
+      css/layout.css: {}
       css/print.css: { media: print }
 
 color.preview:
@@ -62,4 +58,4 @@ maintenance_page:
       css/theme/maintenance-page.css: {}
   dependencies:
     - system/maintenance
-    - bartik/global-styling
+    - bartik/global_styling
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 893586b..b8896e9 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -100,14 +100,14 @@ body,
   [dir="rtl"] #sidebar-second {
     margin-right: 50%;
   }
-  .one-sidebar #sidebar-first,
-  .one-sidebar #sidebar-second {
+  .layout-one-sidebar #sidebar-first,
+  .layout-one-sidebar #sidebar-second {
     width: 100%;
   }
-  .one-sidebar #sidebar-second {
+  .layout-one-sidebar #sidebar-second {
     margin-left: 0; /* LTR */
   }
-  [dir="rtl"] .one-sidebar #sidebar-second {
+  [dir="rtl"] .layout-one-sidebar #sidebar-second {
     margin-right: 0;
   }
   .region-triptych-first,