diff --git a/templates/partials/tags_list.tpl b/templates/partials/tags_list.tpl
index b790d7a..3e9cf63 100644
--- a/templates/partials/tags_list.tpl
+++ b/templates/partials/tags_list.tpl
@@ -1,5 +1,5 @@
 {{{each tags}}}
 <h3 class="pull-left tag-container">
-	<a href="{config.relative_path}/tags/{tags.valueEscaped}" data-value="{tags.valueEscaped}"><span class="tag-item" data-tag="{tags.valueEscaped}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span><span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
+	<a href="{config.relative_path}/tags/{tags.valueEscaped}" data-value="{tags.valueEscaped}"><span class="tag-item tag-class-{tags.class}" data-tag="{tags.valueEscaped}" style="{{{ if tags.color }}}color: {tags.color};{{{ end }}}{{{ if tags.bgColor }}}background-color: {tags.bgColor};{{{ end }}}">{tags.valueEscaped}</span><span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
 </h3>
 {{{end}}}
\ No newline at end of file
diff --git a/templates/partials/topic/tags.tpl b/templates/partials/topic/tags.tpl
index eb39bf8..c55ab8d 100644
--- a/templates/partials/topic/tags.tpl
+++ b/templates/partials/topic/tags.tpl
@@ -1,5 +1,5 @@
 {{{each tags}}}
-<a href="{config.relative_path}/tags/{tags.value}">
-    <span class="tag tag-item tag-{tags.valueEscaped}" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span>
+<a href="{config.relative_path}/tags/{tags.valueEscaped}">
+    <span class="tag tag-item tag-class-{tags.class}" data-tag="{tags.value}" style="{{{ if tags.color }}}color: {tags.color};{{{ end }}}{{{ if tags.bgColor }}}background-color: {tags.bgColor};{{{ end }}}">{tags.valueEscaped}</span>
 </a>
 {{{end}}}
\ No newline at end of file
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index d9e00a8..6b50a45 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -51,14 +51,14 @@
 				</small>
 				<!-- ENDIF !template.category -->
 
-				<!-- IF topics.tags.length -->
+				{{{ if topics.tags.length }}}
 				<span class="tag-list hidden-xs">
 					{{{each topics.tags}}}
-					<a href="{config.relative_path}/tags/{topics.tags.valueEscaped}"><span class="tag tag-{topics.tags.valueEscaped}" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.valueEscaped}</span></a>
+					<a href="{config.relative_path}/tags/{topics.tags.valueEscaped}"><span class="tag tag-item tag-class-{topics.tags.class}" style="{{{ if topics.tags.color }}}color: {topics.tags.color};{{{ end }}}{{{ if topics.tags.bgColor }}}background-color: {topics.tags.bgColor};{{{ end }}}">{topics.tags.valueEscaped}</span></a>
 					{{{end}}}
 					<small>&bull;</small>
 				</span>
-				<!-- ENDIF topics.tags.length -->
+				{{{ end }}}
 
 				<small class="hidden-xs"><span class="timeago" title="{topics.timestampISO}"></span> &bull; <a href="<!-- IF topics.user.userslug -->{config.relative_path}/user/{topics.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.user.userslug -->">{topics.user.displayname}</a></small>
 				<small class="visible-xs-inline">