diff --git a/frontend/sass/commento-card.scss b/frontend/sass/commento-card.scss
new file mode 100644
index 0000000..e884100
--- /dev/null
+++ b/frontend/sass/commento-card.scss
@@ -0,0 +1,93 @@
+.commento-card {
+  @import "commento-options.scss"; // SVG buttons to the right of each comment
+
+  padding: 12px 0px 0px 12px;
+  margin-top: 16px;
+  border-top: 1px solid #f0f0f0;
+
+  .commento-header {
+    padding-bottom: 4px;
+  }
+
+  .commento-avatar::after {
+    content:"";
+    display:block;
+  }
+
+  .commento-name {
+    font-weight: 700;
+    font-size: 14px;
+    color: #555;
+    border: none;
+    display: block;
+    z-index: 1;
+    margin-left: 48px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: fit-content;
+  }
+
+  .commento-flagged::after {
+    content: "Flagged";
+    text-transform: uppercase;
+    font-size: 10px;
+    background: $red-7;
+    color: white;
+    margin-left: 8px;
+    padding: 2px 6px 2px 6px;
+    border-radius: 100px;
+  }
+
+  .commento-subtitle {
+    display: block;
+    color: #999;
+    font-size: 12px;
+    margin-left: 48px;
+  }
+
+  .commento-timeago {
+    display: inline;
+    color: #888;
+    font-size: 12px;
+  }
+
+  .commento-score {
+    display: inline;
+    color: #888;
+    font-size: 12px;
+    font-weight: 700;
+  }
+
+  .commento-timeago::before {
+    content: "\00a0 \00a0 \00b7 \00a0 \00a0";
+  }
+
+  .commento-body {
+    p {
+      margin-top: 6px;
+      margin-bottom: 6px;
+    }
+  }
+
+  .commento-options {
+    float: right;
+    position: relative;
+    height: 38px;
+    z-index: 2;
+  }
+
+  .commento-options-mobile {
+    margin-right: 12px;
+  }
+
+  .commento-options-clearfix {
+    height: 38px;
+    width: 1px;
+    display: block;
+  }
+
+  .commento-moderation {
+    height: 48px;
+  }
+}
diff --git a/frontend/sass/commento-common.scss b/frontend/sass/commento-common.scss
new file mode 100644
index 0000000..a50974f
--- /dev/null
+++ b/frontend/sass/commento-common.scss
@@ -0,0 +1,42 @@
+@import "colors-main.scss";
+
+code {
+  background: $red-1;
+  font-family: monospace;
+  line-height: 1.5;
+  color: $red-6;
+  padding: 2px;
+  margin: 2px;
+}
+
+a {
+  color: $blue-6;
+  border-bottom: 1px solid $blue-6;
+  outline: none;
+  text-decoration: none;
+}
+
+a:focus {
+  box-shadow: 0 0 0 1px rgba(87, 85, 217, .2);
+}
+
+.commento-button {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  cursor: pointer;
+  font-weight: bold;
+  line-height: 24px;
+  font-size: 14px;
+  padding: 6px;
+  padding-left: 8px;
+  padding-right: 8px;
+  box-shadow: 0 4px 6px rgba(50,50,93,.11),0 1px 3px rgba(0,0,0,.08);
+  border: 1px solid transparent;
+  border-radius: 3px;
+  color: #fff;
+  width: 100px;
+  margin-left: 5px;
+  margin-right: 5px;
+}
diff --git a/frontend/sass/commento-input.scss b/frontend/sass/commento-input.scss
index 7f6e848..929294a 100644
--- a/frontend/sass/commento-input.scss
+++ b/frontend/sass/commento-input.scss
@@ -90,27 +90,6 @@ textarea {
   outline: none;
 }
 
-.commento-button {
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  cursor: pointer;
-  font-weight: bold;
-  line-height: 24px;
-  font-size: 14px;
-  padding: 6px;
-  padding-left: 8px;
-  padding-right: 8px;
-  box-shadow: 0 4px 6px rgba(50,50,93,.11),0 1px 3px rgba(0,0,0,.08);
-  border: 1px solid transparent;
-  border-radius: 3px;
-  color: #fff;
-  width: 100px;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
 .commento-google-button {
   background: #dd4b39;
   text-transform: uppercase;
diff --git a/frontend/sass/commento-buttons.scss b/frontend/sass/commento-options.scss
similarity index 100%
rename from frontend/sass/commento-buttons.scss
rename to frontend/sass/commento-options.scss
diff --git a/frontend/sass/commento-tags.scss b/frontend/sass/commento-tags.scss
deleted file mode 100644
index 734130b..0000000
--- a/frontend/sass/commento-tags.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "colors-main.scss";
-
-code {
-  background: $red-1;
-  font-family: monospace;
-  line-height: 1.5;
-  color: $red-6;
-  padding: 2px;
-  margin: 2px;
-}
-
-a {
-  color: $blue-6;
-  border-bottom: 1px solid $blue-6;
-  outline: none;
-  text-decoration: none;
-}
-
-a:focus {
-  box-shadow: 0 0 0 1px rgba(87, 85, 217, .2);
-}
diff --git a/frontend/sass/commento.scss b/frontend/sass/commento.scss
index a8fbdb4..dc84cb2 100644
--- a/frontend/sass/commento.scss
+++ b/frontend/sass/commento.scss
@@ -17,13 +17,12 @@
   }
 
   @import "colors-main.scss";
-
-  @import "commento-tags.scss";
-  @import "commento-footer.scss";
-  @import "commento-input.scss";
-  @import "commento-logged.scss";
-  @import "commento-buttons.scss";
-  @import "commento-login.scss";
+  @import "commento-common.scss";
+  @import "commento-logged.scss";  // Logged in as <name>
+  @import "commento-input.scss";   // Textarea decorations
+  @import "commento-card.scss";    // Each comment card
+  @import "commento-login.scss";   // Popup box when logging in
+  @import "commento-footer.scss";  // Powered by Commento
 
   .commento-hidden {
     display: none;
@@ -107,96 +106,4 @@
     float: left;
     margin-right: 10px;
   }
-
-  .commento-card {
-    padding: 12px 0px 0px 12px;
-    margin-top: 16px;
-    border-top: 1px solid #f0f0f0;
-
-    .commento-header {
-      padding-bottom: 4px;
-    }
-
-    .commento-avatar::after {
-      content:"";
-      display:block;
-    }
-
-    .commento-name {
-      font-weight: 700;
-      font-size: 14px;
-      color: #555;
-      border: none;
-      display: block;
-      z-index: 1;
-      margin-left: 48px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      width: fit-content;
-    }
-
-    .commento-flagged::after {
-      content: "Flagged";
-      text-transform: uppercase;
-      font-size: 10px;
-      background: $red-7;
-      color: white;
-      margin-left: 8px;
-      padding: 2px 6px 2px 6px;
-      border-radius: 100px;
-    }
-
-    .commento-subtitle {
-      display: block;
-      color: #999;
-      font-size: 12px;
-      margin-left: 48px;
-    }
-
-    .commento-timeago {
-      display: inline;
-      color: #888;
-      font-size: 12px;
-    }
-
-    .commento-score {
-      display: inline;
-      color: #888;
-      font-size: 12px;
-      font-weight: 700;
-    }
-
-    .commento-timeago::before {
-      content: "\00a0 \00a0 \00b7 \00a0 \00a0";
-    }
-
-    .commento-body {
-      p {
-        margin-top: 6px;
-        margin-bottom: 6px;
-      }
-    }
-
-    .commento-options {
-      float: right;
-      position: relative;
-      height: 38px;
-      z-index: 2;
-    }
-
-    .commento-options-mobile {
-      margin-right: 12px;
-    }
-
-    .commento-options-clearfix {
-      height: 38px;
-      width: 1px;
-      display: block;
-    }
-
-    .commento-moderation {
-      height: 48px;
-    }
-  }
 }