diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index fd82367..b480d41 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -58,7 +58,7 @@ global-styling:
       css/layout.css: {}
     theme:
       css/colors.css: {}
-      css/print.css: { media: print }
+      css/print.css: {}
 
 messages:
   version: VERSION
diff --git a/core/themes/bartik/css/components/main-content.css b/core/themes/bartik/css/components/main-content.css
index 2d17822..f1b0fe7 100644
--- a/core/themes/bartik/css/components/main-content.css
+++ b/core/themes/bartik/css/components/main-content.css
@@ -12,7 +12,7 @@
   line-height: 1.4;
 }
 
-@media all and (min-width: 851px) {
+@media screen and (min-width: 851px) {
   .main-content {
     float: left; /* LTR */
     position: relative;
diff --git a/core/themes/bartik/css/print.css b/core/themes/bartik/css/print.css
index 4b58dd9..13ad6c3 100644
--- a/core/themes/bartik/css/print.css
+++ b/core/themes/bartik/css/print.css
@@ -1,48 +1,62 @@
+/**
+ * @file
+ * Styles for print in Bartik.
+ */
 
-/* ---------- General Layout ---------- */
+@media print {
 
-body,
-input,
-textarea,
-select {
-  color: #000;
-  background: none;
-}
-body.two-sidebars,
-body.sidebar-first,
-body.sidebar-second,
-body {
-  width: 640px;
-}
-#sidebar-first,
-#sidebar-second,
-.navigation,
-#toolbar,
-.site-footer,
-.tabs,
-.shortcut-action {
-  display: none;
-}
-.one-sidebar .main-content,
-.two-sidebars .main-content {
-  width: 100%;
-}
-.featured-bottom {
-  width: 960px;
-  margin: 0;
-  padding: 0;
-  border: none;
-}
-.featured-bottom-first,
-.featured-bottom-second,
-.featured-bottom-third {
-  width: 250px;
-}
+  /**
+   * Colors and backgrounds.
+   */
+  body {
+    color: #000; /* Black prints faster: h5bp.com/s */
+    background-color: transparent;
+  }
+
+  /**
+   * Toolbar
+   *
+   * Reset Toolbar module's inline styles.
+   */
+  .toolbar-vertical,
+  .toolbar-horizontal {
+    padding-top: 0 !important;
+  }
+
+  /**
+   * Regions
+   *
+   * Hide regions which are unlikely to have relevant content for printing.
+   */
+  .highlighted,
+  .featured-top,
+  .sidebar,
+  .featured-bottom,
+  .site-footer {
+    display: none;
+  }
+
+  /**
+   * Navigation elements.
+   */
+  nav:not(.breadcrumb) {
+    display: none;
+  }
 
-/* ---------- Node Pages ---------- */
+  /**
+   * Comment form.
+   */
+  .comment-form,
+  .comment-form__title {
+    display: none;
+  }
 
-#comments .title,
-#comments form,
-.comment-forbidden {
-  display: none;
+  /**
+   * Node links.
+   */
+  /* This is required to win over specifity of ul.inline li */
+  ul li.comment-add,
+  ul li.comment-forbidden {
+    display: none;
+  }
 }