-<div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>">
-
-<div class="comment-header">
-By
-
-<TMPL_IF NAME="COMMENTUSER">
-<span class="author">
-<TMPL_IF NAME="COMMENTOPENID">
-
-<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-<img src="/wikiicons/openid.png" width="20" height="15" alt="[OpenID]"
- title="Signed in with OpenID" />
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
+<TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
<TMPL_ELSE>
-
-<TMPL_IF NAME="COMMENTAUTHORURL">
-<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-<TMPL_ELSE>
-<TMPL_VAR NAME=COMMENTAUTHOR>
+<TMPL_VAR TITLE>
</TMPL_IF>
-<img src="/wikiicons/signedin.png" width="15" height="15" alt="[Signed in]"
- title="Signed in directly" />
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
+<TMPL_VAR CONTENT>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
+Comment by
+<TMPL_IF COMMENTUSER>
+<TMPL_IF COMMENTOPENID>
+<span class="author" title="OpenID">
+<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
+</span>
+<TMPL_ELSE>
+<span class="author" title="Signed in">
+<TMPL_IF COMMENTAUTHORURL>
+<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR COMMENTAUTHOR>
</TMPL_IF>
</span>
-
-<TMPL_ELSE><!-- !COMMENTUSER -->
-
-<TMPL_IF NAME=COMMENTIP>
-<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
-<TMPL_ELSE><!-- !COMMENTIP -->
+</TMPL_IF>
+<TMPL_ELSE>
+<TMPL_IF COMMENTIP>
+<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
+<TMPL_ELSE>
<span class="author" title="Unauthenticated, from unknown IP address">
</TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
<TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
</TMPL_IF>
-<img src="/wikiicons/anonymous.png" width="15" height="15" alt="[Unauthenticated]" />
</span>
+</TMPL_IF>
+— <TMPL_VAR CTIME>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
+<ul>
+<TMPL_IF REMOVEURL>
+<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
+</TMPL_IF>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
-</TMPL_IF><!-- !COMMENTUSER -->
-
-(<TMPL_VAR CTIME>)
-</div>
-
-<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
-
-</div><!--.comment-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>