diff --git a/static/css/main.css b/static/css/main.css
index 7aae2b2..2c90b34 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -111,6 +111,13 @@ a {
     text-decoration: none;
     color: #FF6600; }
 
+.mg-tag {
+  margin: 0 .5rem;
+  color: #FF6600; }
+  .mg-tag:hover {
+    text-decoration: none;
+    color: #FF6600; }
+
 .mg-list-title {
   font-size: 2em;
   line-height: 42px;
diff --git a/templates/article.html b/templates/article.html
index 113dea8..7c3a0af 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -74,6 +74,8 @@
 
         {% if not MG_DISABLE_SUMMARY %}<p class="uk-article-lead" itemprop="description">{{ article.summary|striptags }}</p>{% endif %}
         <section class="uk-article-content" itemprop="articleBody">{{ article.content }}</section>
+        {% set bullet = joiner(" &bullet; ") %}
+        <div align="right" title="Tags">{% for tag in article.tags %}{{bullet()}}<a class="mg-tag" href="{{tag.url}}"><i class="uk-icon-tag"></i>{{tag.name}}</a>{% endfor %}</div>
         <hr class="uk-article-divider">
     </article>
 
@@ -94,5 +96,10 @@
     <a href="https://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
     {% endif %}
 
+    {% if ISSO_BASE_URL %}
+    <script data-isso="{{ ISSO_BASE_URL }}/" src="{{ ISSO_BASE_URL }}/js/embed.dev.js"></script>
+    <section id="isso-thread"></section>
+    {% endif %}
+
 </div>
 {% endblock %}
diff --git a/templates/partials/article-excerpt.html b/templates/partials/article-excerpt.html
index d82068b..04d2d33 100644
--- a/templates/partials/article-excerpt.html
+++ b/templates/partials/article-excerpt.html
@@ -3,6 +3,8 @@
     <p class="uk-article-meta"><time datetime="{{ article.date.strftime('%Y-%m-%d') }}" itemprop="datePublished">{{ article.locale_date }}</time> • <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% if DISQUS_SITENAME %} • <br class="uk-visible-small"><i class="uk-icon-comment"></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}</p>
     {% if not MG_DISABLE_SUMMARY %}<p class="uk-article-lead" itemprop="description">{{ article.summary|striptags|striptags }}</p>{% endif %}
     <section class="uk-article-content" itemprop="articleBody">{{ article.content }}</section>
+    {% set bullet = joiner(" &bullet; ") %}
+    <div align="right" title="Tags">{% for tag in article.tags %}{{bullet()}}<a class="mg-tag" href="{{tag.url}}"><i class="uk-icon-tag"></i>{{tag.name}}</a>{% endfor %}</div>
     <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread"></a>
     <hr class="uk-article-divider">
 </article>
diff --git a/templates/partials/article-short.html b/templates/partials/article-short.html
index 9bf95f6..b1b5a6b 100644
--- a/templates/partials/article-short.html
+++ b/templates/partials/article-short.html
@@ -5,6 +5,8 @@
     <p class="uk-article-lead" itemprop="description">{{ article.summary|striptags|striptags }}</p>
     {% if not MG_DISABLE_SUMMARY %}<p>{{ ' '.join(article.content.split(' ')[:SUMMARY_MAX_LENGTH ])|striptags|striptags }}...</p>{% endif %}
     <a href="{{ SITEURL }}/{{ article.url }}">Read More</a>
+    {% set bullet = joiner(" &bullet; ") %}
+    <div align="right" title="Tags">{% for tag in article.tags %}{{bullet()}}<a class="mg-tag" href="{{tag.url}}"><i class="uk-icon-tag"></i>{{tag.name}}</a>{% endfor %}</div>
     <hr class="uk-article-divider">
 </article>