diff --git a/resources/templates/themes/bootstrap4/css/custom.css b/resources/templates/themes/bootstrap4/css/custom.css
index d6a3b27..7f459f6 100644
--- a/resources/templates/themes/bootstrap4/css/custom.css
+++ b/resources/templates/themes/bootstrap4/css/custom.css
@@ -35,3 +35,6 @@ html, body {
 	color: white;
 }
 
+a.link-muted {
+	color: #6c757d;
+}
diff --git a/resources/templates/themes/bootstrap4/html/includes/post-content.inc b/resources/templates/themes/bootstrap4/html/includes/post-content.inc
index e14be8d..58ce61f 100644
--- a/resources/templates/themes/bootstrap4/html/includes/post-content.inc
+++ b/resources/templates/themes/bootstrap4/html/includes/post-content.inc
@@ -14,7 +14,7 @@
 		<p class="text-muted"> 
 			Tags: 
 		    {% for tag in post.tags %}
-		    	{{tag.name}}{% if not forloop.last %}, {% endif %}   	
+		    	<a class="link-muted" href="{{tag.uri}}">{{tag.name}}</a>{% if not forloop.last %}, {% endif %}
 		    {% endfor %}  
 		</p>
 	{% endif %}
diff --git a/resources/templates/themes/bootstrap4/html/includes/tagged-posts.inc b/resources/templates/themes/bootstrap4/html/includes/tagged-posts.inc
new file mode 100644
index 0000000..405c634
--- /dev/null
+++ b/resources/templates/themes/bootstrap4/html/includes/tagged-posts.inc
@@ -0,0 +1,12 @@
+<div id="posts-by-tag">
+    <div id="page-header">
+        <h1>Posts Tagged &quot;{{name}}&quot;</h1>
+    </div>
+    <ul>
+    {% for post in posts %}
+        <li>
+            <a href="{{post.uri}}">{{post.title}}</a>
+        </li>
+    {% endfor %}
+    </ul>
+</div>
\ No newline at end of file
diff --git a/resources/templates/themes/bootstrap4/html/tag.html b/resources/templates/themes/bootstrap4/html/tag.html
index b027480..d56114f 100644
--- a/resources/templates/themes/bootstrap4/html/tag.html
+++ b/resources/templates/themes/bootstrap4/html/tag.html
@@ -1,7 +1,5 @@
 {% extends "/html/page-three-column.html" %}
 
 {% block center %}
-	{% with tags=posts %}
-		{% include "/html/includes/post-tags.inc" %}
-	{% endwith %}
+	{% include "/html/includes/tagged-posts.inc" %}
 {% endblock %}