diff --git a/core/themes/bartik/css/components/admin.css b/core/themes/bartik/css/components/admin.css
index a687d44..0234e62 100644
--- a/core/themes/bartik/css/components/admin.css
+++ b/core/themes/bartik/css/components/admin.css
@@ -1,12 +1,16 @@
-/* ---------- Admin-specific Theming ---------- */
-.path-admin .content img {
+/**
+ * @file
+ * Visual styles for using Bartik as an adminstration theme.
+ */
+
+.path-admin .main-content img {
   margin-right: 15px; /* LTR */
 }
-[dir="rtl"] .path-admin .content img {
+[dir="rtl"] .path-admin .main-content img {
   margin-left: 15px;
   margin-right: 0;
 }
-.path-admin .content .simpletest-image img {
+.path-admin .main-content .simpletest-image img {
   margin: 0;
 }
 .path-admin #admin-dblog img {
diff --git a/core/themes/bartik/css/components/block.css b/core/themes/bartik/css/components/block.css
index a1f2aca..4e49170 100644
--- a/core/themes/bartik/css/components/block.css
+++ b/core/themes/bartik/css/components/block.css
@@ -4,7 +4,7 @@
  */
 
 /* Block has it's own content wrapper. */
-.content {
+.block .content {
   margin-top: 10px;
 }
 
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 7c6b4d9..6df6077 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -1,11 +1,14 @@
-/* -------------- Password Field  ------------- */
+/**
+ * @file
+ * Visual styles for Bartik's forms.
+ */
 
+/* Password field. */
 .password-field {
   margin: 0;
 }
 
-/* -------------- Form Elements   ------------- */
-
+/* Form elements. */
 form {
   margin: 0;
   padding: 0;
@@ -137,6 +140,7 @@ input.form-submit:focus {
 .form-actions {
   padding-top: 10px;
 }
+
 /* Node Form */
 #edit-body {
   margin-bottom: 2em;
@@ -237,9 +241,6 @@ input.form-submit:focus {
   line-height: 1.2;
   margin-left: 120px; /* LTR */
 }
-.content h2.comment-form {
-  margin-bottom: 0.5em;
-}
 .comment-form .form-textarea {
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
diff --git a/core/themes/bartik/css/components/main-content.css b/core/themes/bartik/css/components/main-content.css
index 2bc1004..a91a267 100644
--- a/core/themes/bartik/css/components/main-content.css
+++ b/core/themes/bartik/css/components/main-content.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Visual styles for Bartik's content component.
+ * Visual styles for Bartik's main-content component.
  */
 
 .main-content .section {
diff --git a/core/themes/bartik/css/components/node.css b/core/themes/bartik/css/components/node.css
index 207ab32..e557172 100644
--- a/core/themes/bartik/css/components/node.css
+++ b/core/themes/bartik/css/components/node.css
@@ -3,7 +3,6 @@
  * Visual styles for Bartik's node component.
  */
 
-
 .node__content {
   font-size: 1.071em;
   margin-top: 10px;
diff --git a/core/themes/bartik/css/print.css b/core/themes/bartik/css/print.css
index 2349845..2cb497c 100644
--- a/core/themes/bartik/css/print.css
+++ b/core/themes/bartik/css/print.css
@@ -23,8 +23,8 @@ body {
 .add-or-remove-shortcuts {
   display: none;
 }
-.one-sidebar .content,
-.two-sidebars .content {
+.one-sidebar .main-content,
+.two-sidebars .main-content {
   width: 100%;
 }
 #featured-bottom-wrapper {