diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 83b06b5..88ac659 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -28,7 +28,7 @@
   {{ range $pag.Pages }}
   <article class="blog-post">
     <h3 class="blog-post-title_ mb-1"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
-    <p class="blog-post-meta">{{ partial "metadata.html" . }}</p>
+    <p class="blog-post-meta">{{ partial "meta/data.html" . }}</p>
     <p>{{ .Summary }}</p>
   </article>
   {{ end }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 6878184..4ea1296 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -4,11 +4,11 @@
       <div class="columns is-centered">
         <div class="column">
           <h1 class="title is-1">{{ .Title }}</h1>
-          <div class="blog-post-meta">{{ partial "metadata.html" . }}</div>
+          <div class="blog-post-meta">{{ partial "meta/data.html" . }}</div>
           <div class="content">
             {{ .Content }}
           </div>
-          <div class="blog-post-meta mt-5">{{ partial "metafooter.html" . }}</div>
+          <div class="blog-post-meta mt-5">{{ partial "meta/footer.html" . }}</div>
         </div>
       </div>
     </article>
diff --git a/layouts/knowhow/list.html b/layouts/knowhow/list.html
index de94175..de54017 100644
--- a/layouts/knowhow/list.html
+++ b/layouts/knowhow/list.html
@@ -2,7 +2,7 @@
   {{ range .Paginator.Pages.ByTitle }}
   <article class="blog-post">
     <h3 class="blog-post-title_ mb-1"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
-    <!--p class="blog-post-meta">{{ partial "metadata.html" . }}</p-->
+    <!--p class="blog-post-meta">{{ partial "meta/data.html" . }}</p-->
     <p>{{ .Summary }}</p>
   </article>
   {{ end }}
diff --git a/layouts/knowhow/single.html b/layouts/knowhow/single.html
index 6878184..ca1bfa8 100644
--- a/layouts/knowhow/single.html
+++ b/layouts/knowhow/single.html
@@ -4,11 +4,11 @@
       <div class="columns is-centered">
         <div class="column">
           <h1 class="title is-1">{{ .Title }}</h1>
-          <div class="blog-post-meta">{{ partial "metadata.html" . }}</div>
+          <div class="blog-post-meta">{{ partial "meta/data.html" . }}</div>
           <div class="content">
             {{ .Content }}
           </div>
-          <div class="blog-post-meta mt-5">{{ partial "metafooter.html" . }}</div>
+          <div class="blog-post-meta mt-5">{{ partial "meta/footer_skill.html" . }}</div>
         </div>
       </div>
     </article>
diff --git a/layouts/partials/metadata.html b/layouts/partials/meta/data.html
similarity index 100%
rename from layouts/partials/metadata.html
rename to layouts/partials/meta/data.html
diff --git a/layouts/partials/meta/footer.html b/layouts/partials/meta/footer.html
new file mode 100644
index 0000000..1839176
--- /dev/null
+++ b/layouts/partials/meta/footer.html
@@ -0,0 +1,5 @@
+{{ $tagsIdent := .Site.Params.Blog.Tags | default "tags" }}
+{{- partial "taxonomy/metatag.html" (dict "Params" .Params "Ident" $tagsIdent "Feather" "tag") -}}
+
+{{ $catIdent := .Site.Params.Blog.Categories | default "categories" }}
+{{- partial "taxonomy/metatag.html" (dict "Params" .Params "Ident" $catIdent "Feather" "award") -}}
diff --git a/layouts/partials/meta/footer_skill.html b/layouts/partials/meta/footer_skill.html
new file mode 100644
index 0000000..cf202c0
--- /dev/null
+++ b/layouts/partials/meta/footer_skill.html
@@ -0,0 +1,2 @@
+{{ $skillIdent := .Site.Params.KnowHow.Skills | default "skills" }}
+{{- partial "taxonomy/metatag.html" (dict "Params" .Params "Ident" $skillIdent "Feather" "code") -}}
diff --git a/layouts/partials/metafooter.html b/layouts/partials/metafooter.html
deleted file mode 100644
index 35e182a..0000000
--- a/layouts/partials/metafooter.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{{/* TODO Sollte mal aufgeteilt werden*/}}
-
-{{ $tagsIdent := .Site.Params.Blog.Tags | default "tags" }}
-{{ with (index .Params $tagsIdent) }}
-  <i data-feather="tag"></i>
-  <i class="bi bi-tag"></i> <!-- TODO: umstellen auf bootstrap-icons??? -->
-  {{ range . }}
-    {{ $href := print (absURL (printf "%s/" $tagsIdent)) (urlize .) }}
-    <a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href | relURL }}">{{ . }}</a>
-  {{ end }}
-  <i class="mx-2"></i>
-{{ end }}
-
-{{ $catIdent := .Site.Params.Blog.Categories | default "categories" }}
-{{ with (index .Params $catIdent) }}
-  <!-- list -->
-  <i data-feather="award"></i>
-  {{ range . }}
-    {{ $href := print (absURL (printf "%s/" $catIdent)) (urlize .) }}
-    <a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href | relURL }}">{{ . }}</a>
-  {{ end }}
-  <i class="mx-2"></i>
-{{ end }}
-
-{{ $skillIdent := .Site.Params.KnowHow.Skills | default "skills" }}
-{{ with (index .Params $skillIdent) }}
-  <!-- list -->
-  <i data-feather="code"></i>
-  {{ range . }}
-    {{ $href := print (absURL (printf "%s/" $skillIdent)) (urlize .) }}
-    <a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href | relURL }}">{{ . }}</a>
-  {{ end }}
-  <i class="mx-2"></i>
-{{ end }}
diff --git a/layouts/partials/taxonomy/metatag.html b/layouts/partials/taxonomy/metatag.html
new file mode 100644
index 0000000..b477e85
--- /dev/null
+++ b/layouts/partials/taxonomy/metatag.html
@@ -0,0 +1,9 @@
+{{ with (index .Params .Ident) }}
+  <i data-feather="{{ $.Feather }}"></i>
+  <i class="bi bi-tag"></i> <!-- TODO: umstellen auf bootstrap-icons??? -->
+  {{ range . }}
+    {{ $href := print (absURL (printf "%s/" $.Ident)) (urlize .) }}
+    <a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href | relURL }}">{{ . }}</a>
+  {{ end }}
+  <i class="mx-2"></i>
+{{ end }}