diff --git a/themes/paprika/assets/app.css b/themes/paprika/assets/app.css
index 76117a28..67a3f44e 100644
--- a/themes/paprika/assets/app.css
+++ b/themes/paprika/assets/app.css
@@ -387,22 +387,28 @@ article {
     white-space: nowrap;
     scrollbar-width: none;
 
-    a {
-      position: relative;
-      z-index: 2; /* above the inset link */
-  
-      display: inline-block;
-      color: var(--lit);
-      padding: 0.4rem 1rem;
-      border-radius: 0.5rem;
-      transition: background-color 200ms, color 200ms;
-      border: 0.35rem solid var(--fog);
+  }
+}
 
-      &:hover {
-        background-color: var(--fog);
-        color: var(--foreground);
-      }
-    }
+nav[data-tag] {
+  flex-wrap: wrap;
+  gap: 1rem;
+}
+
+.tag {
+  position: relative;
+  z-index: 2; /* above the inset link */
+
+  display: inline-block;
+  color: var(--lit);
+  padding: 0.4rem 1rem;
+  border-radius: 0.5rem;
+  transition: background-color 200ms, color 200ms;
+  border: 0.35rem solid var(--fog);
+
+  &:hover {
+    background-color: var(--fog);
+    color: var(--foreground);
   }
 }
 
diff --git a/themes/paprika/layouts/_default/list.html b/themes/paprika/layouts/_default/list.html
index c3fe71b9..b518abd3 100644
--- a/themes/paprika/layouts/_default/list.html
+++ b/themes/paprika/layouts/_default/list.html
@@ -26,12 +26,9 @@
 
   <h2>{{ .Title }}</h2>
   {{ partial "description" . }}
-  <nav>
-    {{ range .Params.tags }}
-      <a href="/tags/{{ . | urlize }}">{{ . }}</a>
-    {{ end }}
-  </nav>
+  <nav>{{ partial "tags" . }}</nav>
 </article>
+
 {{ end }}
 
 {{ if gt $paginator.TotalPages 1 }}
diff --git a/themes/paprika/layouts/_default/single.html b/themes/paprika/layouts/_default/single.html
index 5419e294..76841241 100644
--- a/themes/paprika/layouts/_default/single.html
+++ b/themes/paprika/layouts/_default/single.html
@@ -7,9 +7,9 @@
   </hgroup>
   <section class="post-content" data-pagefind-body>{{ .Content }}</section>
 
-  <footer class="post-tags" data-pagefind-meta="tags">
-    {{ partial "tags" . }}
-  </footer>
+  <nav data-tag>
+  {{ partial "tags" . }}
+  </nav>
 
   <!-- Post Nav -->
   {{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
diff --git a/themes/paprika/layouts/partials/tags.html b/themes/paprika/layouts/partials/tags.html
index 0c781184..33552e22 100644
--- a/themes/paprika/layouts/partials/tags.html
+++ b/themes/paprika/layouts/partials/tags.html
@@ -1,3 +1,3 @@
 {{ range .Params.tags }} {{ $href := print (absURL "tags/") (urlize .) }}
-<a href="{{ $href }}" class="list-tag">{{ . }}</a>
+<a href="{{ $href }}" class="tag">{{ . }}</a>
 {{ end }}