diff --git a/core/modules/node/css/node.admin.css b/core/modules/node/css/node.admin.css
deleted file mode 100644
index 101a38d..0000000
--- a/core/modules/node/css/node.admin.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @file
- * Styles for administration pages.
- */
-
-/**
- * Revisions overview screen.
- */
-.revision-current {
-  background: #ffc;
-}
diff --git a/core/modules/node/css/node.admin.theme.css b/core/modules/node/css/node.admin.theme.css
new file mode 100644
index 0000000..2135d44
--- /dev/null
+++ b/core/modules/node/css/node.admin.theme.css
@@ -0,0 +1,75 @@
+/**
+ * @file
+ * Styles for node administration.
+ */
+
+/**
+ * Node add/edit form layout.
+ */
+
+/* Narrow screens */
+.layout-region {
+  box-sizing: border-box;
+}
+
+/* Wide screens */
+@media screen and (min-width: 780px), (orientation: landscape) and (min-device-height: 780px) {
+  .layout-region-node-main,
+  .layout-region-node-footer {
+    float: left; /* LTR */
+    width: 65%;
+    padding-right: 2em; /* LTR */
+  }
+
+  [dir="rtl"] .layout-region-node-main,
+  [dir="rtl"] .layout-region-node-footer {
+    float: right;
+    padding-left: 2em;
+    padding-right: 0;
+  }
+
+  .layout-region-node-secondary {
+    float: right; /* LTR */
+    width: 35%;
+  }
+
+  [dir="rtl"] .layout-region-node-secondary {
+    float: left;
+  }
+
+  /* @todo File an issue to add a standard class to all text-like inputs */
+  .layout-region-node-secondary .form-autocomplete,
+  .layout-region-node-secondary .form-text,
+  .layout-region-node-secondary .form-tel,
+  .layout-region-node-secondary .form-email,
+  .layout-region-node-secondary .form-url,
+  .layout-region-node-secondary .form-search,
+  .layout-region-node-secondary .form-number,
+  .layout-region-node-secondary .form-color,
+  .layout-region-node-secondary textarea {
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+  }
+}
+
+/**
+ * The vertical toolbar mode gets triggered for narrow screens, which throws off
+ * the intent of media queries written for the viewport width. When the vertical
+ * toolbar is on, we need to suppress layout for the original media width + the
+ * toolbar width (240px). In this case, 240px + 780px.
+ */
+@media screen and (max-width: 1020px) {
+  .toolbar-vertical.toolbar-tray-open .layout-region-node-main,
+  .toolbar-vertical.toolbar-tray-open .layout-region-node-footer,
+  .toolbar-vertical.toolbar-tray-open .layout-region-node-secondary {
+    float: none;
+    width: auto;
+    padding-right: 0;
+  }
+}
+
+/* Revision color. */
+.revision-current {
+  background: #ffc;
+}
diff --git a/core/modules/node/css/node.module.css b/core/modules/node/css/node.module.css
deleted file mode 100644
index cc865b6..0000000
--- a/core/modules/node/css/node.module.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @file
- * Styles for administration pages.
- */
-
-/**
- * Node add/edit form layout
- */
-
-/* Narrow screens */
-.layout-region {
-  box-sizing:         border-box;
-}
-
-/* Wide screens */
-@media
-  screen and (min-width: 780px),
-  (orientation: landscape) and (min-device-height: 780px) {
-
-  .layout-region-node-main,
-  .layout-region-node-footer {
-    float: left; /* LTR */
-    width: 65%;
-    padding-right: 2em; /* LTR */
-  }
-
-  [dir="rtl"] .layout-region-node-main,
-  [dir="rtl"] .layout-region-node-footer {
-    float: right;
-    padding-left: 2em;
-    padding-right: 0;
-  }
-
-  .layout-region-node-secondary {
-    float: right; /* LTR */
-    width: 35%;
-  }
-
-  [dir="rtl"] .layout-region-node-secondary {
-    float: left;
-  }
-
-  /* @todo File an issue to add a standard class to all text-like inputs */
-  .layout-region-node-secondary .form-autocomplete,
-  .layout-region-node-secondary .form-text,
-  .layout-region-node-secondary .form-tel,
-  .layout-region-node-secondary .form-email,
-  .layout-region-node-secondary .form-url,
-  .layout-region-node-secondary .form-search,
-  .layout-region-node-secondary .form-number,
-  .layout-region-node-secondary .form-color,
-  .layout-region-node-secondary textarea {
-    box-sizing:         border-box;
-    width: 100%;
-    max-width: 100%;
-  }
-}
-
-/**
- * The vertical toolbar mode gets triggered for narrow screens, which throws off
- * the intent of media queries written for the viewport width. When the vertical
- * toolbar is on, we need to suppress layout for the original media width + the
- * toolbar width (240px). In this case, 240px + 780px.
- */
-@media
-  screen and (max-width: 1020px) {
-
-  .toolbar-vertical.toolbar-tray-open .layout-region-node-main,
-  .toolbar-vertical.toolbar-tray-open .layout-region-node-footer,
-  .toolbar-vertical.toolbar-tray-open .layout-region-node-secondary {
-    float: none;
-    width: auto;
-    padding-right: 0;
-  }
-}
diff --git a/core/modules/node/css/node.preview.css b/core/modules/node/css/node.preview.css
deleted file mode 100644
index 481a02e..0000000
--- a/core/modules/node/css/node.preview.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * Styles for node preview page.
- */
-
-.node-preview-container {
-  position: fixed;
-  z-index: 499;
-  width: 100%;
-  padding: 10px;
-}
-
-@media only screen and (min-width: 36em) {
-  .node-preview-container .form-type-select {
-    margin-left: 25%; /* LTR */
-  }
-  [dir="rtl"] .node-preview-container .form-type-select {
-    margin-right: 25%;
-    margin-left: 0%;
-  }
-}
diff --git a/core/modules/node/css/node.theme.css b/core/modules/node/css/node.theme.css
new file mode 100644
index 0000000..481a02e
--- /dev/null
+++ b/core/modules/node/css/node.theme.css
@@ -0,0 +1,21 @@
+/**
+ * @file
+ * Styles for node preview page.
+ */
+
+.node-preview-container {
+  position: fixed;
+  z-index: 499;
+  width: 100%;
+  padding: 10px;
+}
+
+@media only screen and (min-width: 36em) {
+  .node-preview-container .form-type-select {
+    margin-left: 25%; /* LTR */
+  }
+  [dir="rtl"] .node-preview-container .form-type-select {
+    margin-right: 25%;
+    margin-left: 0%;
+  }
+}
diff --git a/core/modules/node/node.libraries.yml b/core/modules/node/node.libraries.yml
index 22c93ac..30e2007 100644
--- a/core/modules/node/node.libraries.yml
+++ b/core/modules/node/node.libraries.yml
@@ -1,8 +1,8 @@
 drupal.node:
   version: VERSION
   css:
-    layout:
-      css/node.module.css: {}
+    theme:
+      css/node.admin.theme.css: {}
   js:
     node.js: {}
   dependencies:
@@ -15,7 +15,7 @@ drupal.node.preview:
   version: VERSION
   css:
     theme:
-      css/node.preview.css: {}
+      css/node.theme.css: {}
   js:
     node.preview.js: {}
   dependencies:
@@ -32,15 +32,3 @@ drupal.content_types:
     - core/jquery
     - core/drupal
     - core/drupal.form
-
-form:
-  version: VERSION
-  css:
-    layout:
-      css/node.module.css: {}
-
-drupal.node.admin:
-  version: VERSION
-  css:
-    theme:
-      css/node.admin.css: {}
diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index 1cb43be..8fb75da 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -226,7 +226,7 @@ public function revisionOverview(NodeInterface $node) {
       '#rows' => $rows,
       '#header' => $header,
       '#attached' => array(
-        'library' => array('node/drupal.node.admin'),
+        'library' => array('node/drupal.node'),
       ),
     );