diff --git a/site/_includes/-taglist.njk b/site/_includes/-taglist.njk
new file mode 100644
index 0000000..2d191c0
--- /dev/null
+++ b/site/_includes/-taglist.njk
@@ -0,0 +1,7 @@
+<div style="--totalTags:{{ collections.categories | dictsort | length }}">
+  {%- for tag, data in collections.categories -%}
+    <a class="button tag" style="--tagIndex:{{ collections.categories[tag].id }}" href="/tags/{{ tag | slugify }}/">{{ tag }}
+      <span class="tagCount">{{ data.count }}</span>
+    </a>
+  {%- endfor -%}
+</div>
diff --git a/site/_includes/collection.njk b/site/_includes/collection.njk
index edbaefa..cfa0e23 100644
--- a/site/_includes/collection.njk
+++ b/site/_includes/collection.njk
@@ -12,13 +12,7 @@ eleventyComputed:
   {% set tag = page.fileSlug %}
   {% if collections[tag] %}
     {% if tag === "posts" %}
-      <div style="--totalTags:{{ collections.categories | dictsort | length }}">
-        {%- for tag, data in collections.categories -%}
-          <a class="button tag" style="--tagIndex:{{ collections.categories[tag].id }}" href="/tags/{{ tag | slugify }}/">{{ tag }}
-            <span class="tagCount">{{ data.count }}</span>
-          </a>
-        {%- endfor -%}
-      </div>
+      {% include "-taglist.njk" %}
     {% endif %}
     {{ collectionList(tag) }}
   {% endif %}
diff --git a/site/_includes/css/site.css b/site/_includes/css/site.css
index 073da35..bd24854 100644
--- a/site/_includes/css/site.css
+++ b/site/_includes/css/site.css
@@ -665,7 +665,6 @@ button, a.button {
   background-color: var(--c-text-background);
   font-size: 1rem;
   padding: 0.5rem;
-  margin: 0 0.2em 0.2em 0;
   border-radius: 0.2rem;
   border: none;
   cursor: pointer;
@@ -679,7 +678,9 @@ button, a.button {
     0 0 1rem var(--c-accent);
   }
 }
-
+.button.tag {
+  margin: 0 0.2em 0.2em 0;
+}
 .tag {
   display: inline-flex;
   &::before {
diff --git a/site/_includes/home.njk b/site/_includes/home.njk
index 9998cfb..5a4bcee 100644
--- a/site/_includes/home.njk
+++ b/site/_includes/home.njk
@@ -7,6 +7,7 @@ layout: "base.njk"
   {%- for name, collection in collections -%}
     {%- if name in ["posts"] -%}
       <h2>{{name | capitalize }}</h2>
+      {% include "-taglist.njk" %}
       {{ collectionList(name, limit=5) }}
     {%- endif -%}
   {%- endfor -%}