diff --git a/bootstrap_subtheme/less/overrides.less b/bootstrap_subtheme/less/overrides.less
index f2e21d8..6ff060d 100644
--- a/bootstrap_subtheme/less/overrides.less
+++ b/bootstrap_subtheme/less/overrides.less
@@ -536,3 +536,20 @@ th.radio,
 td.radio {
   display: table-cell;
 }
+
+#comments {
+  .user-picture a {
+    display: block;
+    width: 64px;
+    height: 64px;
+  }
+  img {
+    width: 100%;
+  }
+  .indented {
+    margin-left: 74px;
+  }
+  .authoring {
+    padding-left: 5px;
+  }
+}
diff --git a/theme/comment/comment.tpl.php b/theme/comment/comment.tpl.php
new file mode 100644
index 0000000..d94c6e5
--- /dev/null
+++ b/theme/comment/comment.tpl.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Bootstrap theme implementation for comments.
+ *
+ * Available variables:
+ * - $author: Comment author. Can be link or plain text.
+ * - $content: An array of comment items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $created: Formatted date and time for when the comment was created.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->created variable.
+ * - $changed: Formatted date and time for when the comment was last changed.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->changed variable.
+ * - $new: New comment marker.
+ * - $permalink: Comment permalink.
+ * - $submitted: Submission information created from $author and $created during
+ *   template_preprocess_comment().
+ * - $picture: Authors picture.
+ * - $signature: Authors signature.
+ * - $status: Comment status. Possible values are:
+ *   comment-unpublished, comment-published or comment-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
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - 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.
+ *   The following applies only to viewers who are registered users:
+ *   - comment-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.
+ * - $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.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ * - $time_ago: time since changed.
+ *
+ * These two variables are provided for context:
+ * - $comment: Full comment object.
+ * - $node: Node object the comments are attached to.
+ *
+ * Other variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_comment()
+ * @see template_process()
+ * @see theme_comment()
+ *
+ * @ingroup themeable
+ */
+?>
+<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+  <div class="pull-left">
+    <?php print $picture; ?>
+  </div>
+  <div class="media-body">
+      <?php print render($title_prefix); ?>
+      <h4<?php print $title_attributes; ?>><?php print $title; ?></h4>
+      <?php print render($title_suffix); ?>
+    <div class="content"<?php print $content_attributes; ?>>
+      <?php
+        // We hide the comments and links now so that we can render them later.
+        hide($content['links']);
+        print render($content);
+      ?>
+      <?php if ($signature): ?>
+      <div class="user-signature clearfix">
+        <?php print $signature; ?>
+      </div>
+      <?php endif; ?>
+    </div>
+  <span class="authoring">
+        <?php print $author; ?> - <?php print $time_ago; ?> - <?php print $permalink; ?>
+    </span>
+    <?php print render($content['links']) ?>
+  </div>
+
+</div>
diff --git a/theme/comment/comment.vars.php b/theme/comment/comment.vars.php
new file mode 100644
index 0000000..37ad430
--- /dev/null
+++ b/theme/comment/comment.vars.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @file
+ * comment.vars.php
+ *
+ * @see comment.tpl.php
+ */
+
+/**
+ * Implements template_preprocess_comment().
+ */
+function bootstrap_preprocess_comment(&$variables) {
+  $comment = $variables['elements']['#comment'];
+  $node = $variables['elements']['#node'];
+
+  $variables['classes_array'][] = 'media';
+  $variables['title_attributes_array']['class'][] = 'media-heading';
+  $variables['time_ago'] = format_interval((time() - $comment->changed) , 2) . t(' ago');
+}
