diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index 5a1387d47c7f7b73d473b37f3b57144b91bfd665..009a67f9d60714b53af16d5a30acfb2c80dc8aa1 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -1,9 +1,9 @@
 global-styling:
   version: VERSION
   css:
-    theme:
+    base:
       css/base/elements.css: {}
-      css/layout.css: {}
+    component:
       css/components/admin.css: {}
       css/components/block.css: {}
       css/components/book.css: {}
@@ -44,13 +44,16 @@ global-styling:
       css/components/views.css: {}
       css/components/buttons.css: {}
       css/components/ui-dialog.css: {}
+    layout:
+      css/layout.css: {}
+    theme:
       css/colors.css: {}
       css/print.css: { media: print }
 
 messages:
   version: VERSION
   css:
-    theme:
+    component:
       css/components/messages.css: { preprocess: false }
 
 color.preview: