diff --git a/core/themes/bartik/templates/comment-wrapper.tpl.php b/core/themes/bartik/templates/comment-wrapper.tpl.php
index fd8dfa7..99e2198 100644
--- a/core/themes/bartik/templates/comment-wrapper.tpl.php
+++ b/core/themes/bartik/templates/comment-wrapper.tpl.php
@@ -1,6 +1,5 @@
-<?php
-
-/**
+{#
+ /*
  * @file
  * Bartik's theme implementation to provide an HTML container for comments.
  *
@@ -31,18 +30,25 @@
  *
  * @ingroup themeable
  */
-?>
-<section id="comments" <?php print $attributes; ?>>
-  <?php if ($content['comments'] && $node->type != 'forum'): ?>
-    <?php print render($title_prefix); ?>
-    <h2 class="title"><?php print t('Comments'); ?></h2>
-    <?php print render($title_suffix); ?>
-  <?php endif; ?>
+ #}
+
+<section id="comments" class="{{ attributes.class }}"{{ attributes }}>
+
+  {# TODO forum module should extend comment template to keep the code in here clean #}
+  {% if comments %}
+    {% if node.type != 'forum' %}
+      {{ title.prefix }}
+      <h2 class="title">{{ 'Comments' | t }}</h2>
+      {{ title.suffix }}
+    {% endif %}
+
+    {{ comments }}
+
+  {% endif %}
 
-  <?php print render($content['comments']); ?>
+  {% if comment_form %}
+    <h2 class="title comment-form">{{ 'Add new comment' | t }}</h2>
+    {{ comment_form }}
+  {% endif %}
 
-  <?php if ($content['comment_form']): ?>
-    <h2 class="title comment-form"><?php print t('Add new comment'); ?></h2>
-    <?php print render($content['comment_form']); ?>
-  <?php endif; ?>
 </section>
diff --git a/core/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php
index a8c4924..9118640 100644
--- a/core/themes/bartik/templates/comment.tpl.php
+++ b/core/themes/bartik/templates/comment.tpl.php
@@ -1,30 +1,29 @@
-<?php
-
+{#
 /**
  * @file
  * Bartik's theme implementation for comments.
  *
  * Available variables:
- * - $author: Comment author. Can be a link or plain text.
- * - $content: An array of comment items. Use render($content) to print them
+ * - author: Comment author. Can be a 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.
+ * - 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.
+ * - 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
+ * - new: New comment marker.
+ * - permalink: Comment permalink.
+ * - submitted: Submission information created from $author and $created
  *   during template_preprocess_comment().
- * - $signature: Authors signature.
- * - $status: Comment status. Possible values are:
+ * - signature: Authors signature.
+ * - status: Comment status. Possible values are:
  *   unpublished, published, or preview.
- * - $title: Linked title.
- * - $attributes: An instance of Attributes class that can be manipulated as an
+ * - title: Linked title.
+ * - attributes: An instance of Attributes class that can be manipulated as an
  *    array and printed as a string.
  *    It includes the 'class' information, which includes:
  *   - comment: The current template type; e.g., 'theming hook'.
@@ -35,22 +34,22 @@
  *   - unpublished: An unpublished comment visible only to administrators.
  *   - by-viewer: Comment by the user currently viewing the page.
  *   - new: New comment since the last visit.
- * - $title_prefix (array): An array containing additional output populated by
+ * - 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
+ * - 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.
  *
  * These variables are provided to give context about the parent comment (if
  * any):
- * - $comment_parent: Full parent comment object (if any).
- * - $parent_author: Equivalent to $author for the parent comment.
- * - $parent_created: Equivalent to $created for the parent comment.
- * - $parent_changed: Equivalent to $changed for the parent comment.
- * - $parent_title: Equivalent to $title for the parent comment.
- * - $parent_permalink: Equivalent to $permalink for the parent comment.
- * - $parent: A text string of parent comment submission information created
+ * - comment_parent: Full parent comment object (if any).
+ * - parent_author: Equivalent to $author for the parent comment.
+ * - parent_created: Equivalent to $created for the parent comment.
+ * - parent_changed: Equivalent to $changed for the parent comment.
+ * - parent_title: Equivalent to $title for the parent comment.
+ * - parent_permalink: Equivalent to $permalink for the parent comment.
+ * - parent: A text string of parent comment submission information created
  *   from $parent_author and $parent_created during
  *   template_preprocess_comment(). This information is presented to help
  *   screen readers follow lengthy discussion threads. You can hide this from
@@ -63,72 +62,72 @@
  * @see template_preprocess()
  * @see template_preprocess_comment()
  * @see template_process()
- * @see theme_comment()
  *
  * @ingroup themeable
  */
-?>
-<article class="<?php print $attributes['class']; ?> clearfix"<?php print $attributes; ?> role="article">
+#}
+<article class="{{ attributes.class }} clearfix"{{ attributes }}>
 
   <header class="comment-header">
 
     <div class="attribution">
-      <?php print render($user_picture); ?>
+      {{ user_picture }}
 
       <div class="submitted">
         <p class="commenter-name">
-          <?php print $author; ?>
+          {{ author }}
         </p>
         <p class="comment-time">
-          <?php print $created; ?>
+          {{ created }}
         </p>
         <p class="comment-permalink">
-          <?php print $permalink; ?>
+          {{ permalink }}
         </p>
-        <?php
+        {#
           // Indicate the semantic relationship between parent and child comments
           // for accessibility. The list is difficult to navigate in a screen
           // reader without this information.
-          if ($parent):
-        ?>
+        #}
+        {% if parent is defined %}
         <p class="comment-parent element-invisible">
-          <?php print $parent; ?>
+          {{ parent }}
         </p>
-        <?php endif; ?>
+        {% endif %}
       </div>
     </div> <!-- /.attribution -->
 
     <div class="comment-text">
       <div class="comment-arrow"></div>
 
-      <?php if ($new): ?>
-        <span class="new"><?php print $new; ?></span>
-      <?php endif; ?>
-
+      {% if new %}
+        <span class="new"> {{ new }}</span>
+        {% endif %}
       <?php print render($title_prefix); ?>
-      <h3<?php print $title_attributes; ?>><?php print $title; ?></h3>
-      <?php print render($title_suffix); ?>
+      {{ title_prefix }}
+      <h3 {{ title_attributes }}>{{ title | t }}</h3?
+      {{ title_suffix }}
     </div> <!-- /.comment-text -->
 
   </header> <!-- /.comment-header -->
 
-  <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);
-    ?>
+  <div class="content" {{ content_attributes }}>
+    {#
+      /* We hide the comments and links now so that we can render them later. */
+    #}
+    {{ hide(content.links) }}
+    {{ content }}
   </div> <!-- /.content -->
 
   <footer class="comment-footer">
-    <?php if ($signature): ?>
+
+    {% if signature %}
       <div class="user-signature clearfix">
-        <?php print $signature; ?>
+        {{ signature }}
       </div>
-    <?php endif; ?>
+    {% endif %}
 
     <nav>
-      <?php print render($content['links']); ?>
+      {{ content.links }}
     </nav>
   </footer> <!-- /.comment-footer -->