diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index 5d36744..be960e3 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -4,17 +4,19 @@ global-styling:
     theme:
       css/base/elements.css: {}
       css/base/typography.css: {}
+      css/layout.css: {}
       css/components/admin.css: {}
       css/components/book.css: {}
       css/components/breadcrumb.css: {}
       css/components/captions.css: {}
       css/components/comments.css: {}
       css/components/content.css: {}
-      css/components/dropbutton.css: {}
+      css/components/contextual.css: {}
+      css/components/dropbutton.component.css: {}
       css/components/featured.css: {}
       css/components/footer.css: {}
       css/components/form.css: {}
-      css/components/hacks.css: {}
+      css/components/forum.css: {}
       css/components/header.css: {}
       css/components/help.css: {}
       css/components/highlighted.css: {}
@@ -38,7 +40,6 @@ global-styling:
       css/components/buttons.css: {}
       css/components/media.css: {}
       css/colors.css: {}
-      css/layout.css: {}
       css/print.css: { media: print }
 
 color.preview:
@@ -58,4 +59,4 @@ maintenance_page:
       css/theme/maintenance-page.css: {}
   dependencies:
     - system/maintenance
-    - bartik/global_styling
+    - bartik/global-styling
diff --git a/core/themes/bartik/css/components/contextual.css b/core/themes/bartik/css/components/contextual.css
new file mode 100644
index 0000000..0b08395
--- /dev/null
+++ b/core/themes/bartik/css/components/contextual.css
@@ -0,0 +1,4 @@
+#header .contextual .trigger,
+#footer-wrapper .contextual .trigger {
+  border: none;
+}
diff --git a/core/themes/bartik/css/components/dropbutton.css b/core/themes/bartik/css/components/dropbutton.component.css
similarity index 100%
rename from core/themes/bartik/css/components/dropbutton.css
rename to core/themes/bartik/css/components/dropbutton.component.css
diff --git a/core/themes/bartik/css/components/forum.css b/core/themes/bartik/css/components/forum.css
new file mode 100644
index 0000000..2d0d7b3
--- /dev/null
+++ b/core/themes/bartik/css/components/forum.css
@@ -0,0 +1,6 @@
+#forum .name {
+  font-size: 1.083em;
+}
+#forum .description {
+  font-size: 1em;
+}
\ No newline at end of file
diff --git a/core/themes/bartik/css/components/hacks.css b/core/themes/bartik/css/components/hacks.css
deleted file mode 100644
index 0fd12e0..0000000
--- a/core/themes/bartik/css/components/hacks.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -------------- Other Overrides ------------- */
-
-div.password-suggestions {
-  border: 0;
-}
-#forum .name {
-  font-size: 1.083em;
-}
-#forum .description {
-  font-size: 1em;
-}
-#header .contextual .trigger,
-#footer-wrapper .contextual .trigger {
-  border: none;
-}
diff --git a/core/themes/bartik/css/components/tabs.css b/core/themes/bartik/css/components/tabs.css
index c7577bd..00f8e70 100644
--- a/core/themes/bartik/css/components/tabs.css
+++ b/core/themes/bartik/css/components/tabs.css
@@ -46,7 +46,7 @@ div.tabs {
     margin: 0;
     overflow: hidden;
     border: none;
-    background: transparent url(../images/tabs-border.png) repeat-x left bottom;
+    background: transparent url(../../images/tabs-border.png) repeat-x left bottom;
     white-space: nowrap;
   }
   .tabs ul.primary li {
diff --git a/core/themes/bartik/css/components/user.css b/core/themes/bartik/css/components/user.css
index 9382607..3963534 100644
--- a/core/themes/bartik/css/components/user.css
+++ b/core/themes/bartik/css/components/user.css
@@ -3,3 +3,6 @@
 .profile .field-name-field-user-picture {
   float: none;
 }
+div.password-suggestions {
+  border: 0;
+}