diff --git a/modules/comment/comment-rtl.css b/modules/comment/comment-rtl.css
deleted file mode 100644
index 39c3929..0000000
--- a/modules/comment/comment-rtl.css
+++ /dev/null
@@ -1,5 +0,0 @@
-
-.indented {
-  margin-left: 0;
-  margin-right: 25px;
-}
diff --git a/modules/comment/comment.css b/modules/comment/comment.css
deleted file mode 100644
index a55f527..0000000
--- a/modules/comment/comment.css
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#comments {
-  margin-top: 15px;
-}
-.indented {
-  margin-left: 25px; /* LTR */
-}
-.comment-unpublished {
-  background-color: #fff4f4;
-}
-.comment-preview {
-  background-color: #ffffea;
-}
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index 949ffc2..b23f38e 100644
--- a/modules/comment/comment.info
+++ b/modules/comment/comment.info
@@ -8,4 +8,4 @@ dependencies[] = entity
 files[] = comment.module
 files[] = comment.test
 configure = admin/content/comment
-stylesheets[all][] = comment.css
+stylesheets[all][] = comment.theme.css
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index ae9278c..d44e110 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -2290,18 +2290,18 @@ function template_preprocess_comment(&$variables) {
 
   // Set status to a string representation of comment->status.
   if (isset($comment->in_preview)) {
-    $variables['status'] = 'comment-preview';
+    $variables['status'] = 'preview';
   }
   else {
-    $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : 'comment-published';
+    $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'unpublished' : 'published';
   }
   // Gather comment classes.
   if ($comment->uid == 0) {
     $variables['classes_array'][] = 'comment-by-anonymous';
   }
   else {
-    // Published class is not needed. It is either 'comment-preview' or 'comment-unpublished'.
-    if ($variables['status'] != 'comment-published') {
+    // Published class is not needed. It is either 'preview' or 'unpublished'.
+    if ($variables['status'] != 'published') {
       $variables['classes_array'][] = $variables['status'];
     }
     if ($comment->uid === $variables['node']->uid) {
diff --git a/modules/comment/comment.theme-rtl.css b/modules/comment/comment.theme-rtl.css
new file mode 100644
index 0000000..9280422
--- /dev/null
+++ b/modules/comment/comment.theme-rtl.css
@@ -0,0 +1,4 @@
+.indented {
+  margin-left: 0;
+  margin-right: 25px;
+}
diff --git a/modules/comment/comment.theme.css b/modules/comment/comment.theme.css
new file mode 100644
index 0000000..1e36947
--- /dev/null
+++ b/modules/comment/comment.theme.css
@@ -0,0 +1,3 @@
+.indented {
+  margin-left: 25px; /* LTR */
+}
diff --git a/modules/comment/comment.tpl.php b/modules/comment/comment.tpl.php
index a483813..51645e0 100644
--- a/modules/comment/comment.tpl.php
+++ b/modules/comment/comment.tpl.php
@@ -23,7 +23,7 @@
  * - $picture: Authors picture.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
- *   comment-unpublished, comment-published or comment-preview.
+ *   unpublished, published or preview.
  * - $title: Linked title.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
@@ -31,11 +31,11 @@
  *   - comment: The current template type, i.e., "theming hook".
  *   - comment-by-anonymous: Comment by an unregistered user.
  *   - comment-by-node-author: Comment by the author of the parent node.
- *   - comment-preview: When previewing a new or edited comment.
+ *   - preview: When previewing a new or edited comment.
  *   The following applies only to viewers who are registered users:
- *   - comment-unpublished: An unpublished comment visible only to administrators.
+ *   - unpublished: An unpublished comment visible only to administrators.
  *   - comment-by-viewer: Comment by the user currently viewing the page.
- *   - comment-new: New comment since last the visit.
+ *   - comment-new: New comment since last visit.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.
diff --git a/modules/system/system.theme.css b/modules/system/system.theme.css
index f34a965..72276d6 100644
--- a/modules/system/system.theme.css
+++ b/modules/system/system.theme.css
@@ -38,6 +38,16 @@ tr.odd {
 }
 
 /**
+ * Publishing options.
+ */
+.unpublished {
+  background-color: #fff4f4;
+}
+.preview {
+  background-color: #ffffea;
+}
+
+/**
  * Markup generated by theme_tablesort_indicator().
  */
 th.active img {
diff --git a/themes/bartik/css/style-rtl.css b/themes/bartik/css/style-rtl.css
index d25006f..b41823f 100644
--- a/themes/bartik/css/style-rtl.css
+++ b/themes/bartik/css/style-rtl.css
@@ -121,7 +121,7 @@ ul.tips {
 .comment ul.links li {
   padding: 0 0 0.5em;
 }
-.comment-unpublished {
+.comment.unpublished {
   margin-left: 5px;
   margin-right: 0;
   padding: 5px 5px 5px 2px;
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 4fb8210..c392e6b 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -737,11 +737,11 @@ ul.links {
 .comment ul.links li {
   padding: 0 0.5em 0 0; /* LTR */
 }
-.comment-unpublished {
+.comment.unpublished {
   margin-right: 5px; /* LTR */
   padding: 5px 2px 5px 5px; /* LTR */
 }
-.comment-unpublished .comment-text .comment-arrow {
+.comment.unpublished .comment-text .comment-arrow {
   border-left: 1px solid #fff4f4;
   border-right: 1px solid #fff4f4;
 }
diff --git a/themes/bartik/templates/comment.tpl.php b/themes/bartik/templates/comment.tpl.php
index d64487d..7d19790 100644
--- a/themes/bartik/templates/comment.tpl.php
+++ b/themes/bartik/templates/comment.tpl.php
@@ -23,7 +23,7 @@
  * - $picture: Authors picture.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
- *   comment-unpublished, comment-published or comment-preview.
+ *   unpublished, published or preview.
  * - $title: Linked title.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
@@ -31,11 +31,11 @@
  *   - comment: The current template type, i.e., "theming hook".
  *   - comment-by-anonymous: Comment by an unregistered user.
  *   - comment-by-node-author: Comment by the author of the parent node.
- *   - comment-preview: When previewing a new or edited comment.
+ *   - preview: When previewing a new or edited comment.
  *   The following applies only to viewers who are registered users:
- *   - comment-unpublished: An unpublished comment visible only to administrators.
+ *   - unpublished: An unpublished comment visible only to administrators.
  *   - comment-by-viewer: Comment by the user currently viewing the page.
- *   - comment-new: New comment since last the visit.
+ *   - comment-new: New comment since last visit.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.