diff --git a/src/_includes/layouts/book.html b/src/_includes/layouts/book.html
index 9c46c8e..2df6093 100644
--- a/src/_includes/layouts/book.html
+++ b/src/_includes/layouts/book.html
@@ -4,6 +4,7 @@ layout: "layouts/base"
 
 {% from "macros/date.njk" import format %}
 {% from "macros/utils.njk" import stars %}
+{% from "macros/tags.njk" import tagList %}
 <header class="flow flow-space-1">
     {{ format(page.date) }}
     <h1>{{ title }}</h1>
@@ -38,12 +39,4 @@ layout: "layouts/base"
     </div>
 </footer>
 <hr class="my-2">
-<ul class="categories cluster list-none p-0 line-height-m">
-    {% for tag in tags | filter("book") %}
-        <li>
-            <a class="button" href="/books/tag/{{ tag | slugify }}">
-                {% include "svgs/frame.svg" %}
-            {{ tag }}</a>
-        </li>
-    {% endfor %}
-</ul>
+{{ tagList(tags | filter("book") , "/books") }}
diff --git a/src/_includes/layouts/game.html b/src/_includes/layouts/game.html
index 9edb458..4fddca2 100644
--- a/src/_includes/layouts/game.html
+++ b/src/_includes/layouts/game.html
@@ -4,6 +4,7 @@ layout: "layouts/base"
 
 {% from "macros/date.njk" import format %}
 {% from "macros/utils.njk" import stars %}
+{% from "macros/tags.njk" import tagList %}
 <header class="flow flow-space-1">
     {{ format(page.date) }}
     <h1>{{ title }}</h1>
@@ -41,12 +42,4 @@ layout: "layouts/base"
     </div>
 </footer>
 <hr class="my-2">
-<ul class="categories cluster list-none p-0 line-height-m">
-    {% for tag in tags | filter("game") %}
-        <li>
-            <a class="button" href="/books/tag/{{ tag | slugify }}">
-                {% include "svgs/frame.svg" %}
-            {{ tag }}</a>
-        </li>
-    {% endfor %}
-</ul>
+{{ tagList(tags | filter("game") , "/games") }}
diff --git a/src/_includes/layouts/movie.html b/src/_includes/layouts/movie.html
index 860c40a..8088b02 100644
--- a/src/_includes/layouts/movie.html
+++ b/src/_includes/layouts/movie.html
@@ -4,6 +4,7 @@ layout: "layouts/base"
 
 {% from "macros/date.njk" import format %}
 {% from "macros/utils.njk" import stars %}
+{% from "macros/tags.njk" import tagList %}
 <header class="flow flow-space-1">
     {{ format(page.date) }}
     <h1>{{ title }}</h1>
@@ -53,11 +54,7 @@ layout: "layouts/base"
                     <strong>Runtime</strong><span>{{ runtime }} mins</span>
                 </li>
             {% endif %}
-            {% if tags %}
-                <li class="flex-col meta-grid--full">
-                    <strong>Genres</strong><span>{{ tags | filter("movie") | join(", ") }}</span>
-                </li>
-            {% endif %}
         </ul>
     </div>
 </footer>
+{{ tagList(tags | filter("movie") , "/watching/movies") }}
diff --git a/src/_includes/layouts/show.html b/src/_includes/layouts/show.html
index 49e40e3..0ba1025 100644
--- a/src/_includes/layouts/show.html
+++ b/src/_includes/layouts/show.html
@@ -4,6 +4,7 @@ layout: "layouts/base"
 
 {% from "macros/date.njk" import format %}
 {% from "macros/utils.njk" import stars %}
+{% from "macros/tags.njk" import tagList %}
 <header class="flow flow-space-1">
     {{ format(page.date) }}
     <h1>{{ title }}</h1>
@@ -56,3 +57,4 @@ layout: "layouts/base"
         </ul>
     </div>
 </footer>
+{{ tagList(tags | filter("tv") , "/watching/shows") }}
diff --git a/src/_includes/macros/tags.njk b/src/_includes/macros/tags.njk
new file mode 100644
index 0000000..10f91d6
--- /dev/null
+++ b/src/_includes/macros/tags.njk
@@ -0,0 +1,11 @@
+{% macro tagList(tags, urlPrefix) %}
+<ul class="categories cluster list-none p-0 line-height-m">
+    {% for tag in tags %}
+        <li>
+            <a class="button" href="{{ urlPrefix }}/tag/{{ tag | slugify }}">
+                {% include "svgs/frame.svg" %}
+            {{ tag }}</a>
+        </li>
+    {% endfor %}
+</ul>
+{% endmacro %}