diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default/taxonomy.html
index b514010..4c3439f 100644
--- a/themes/buha/layouts/_default/taxonomy.html
+++ b/themes/buha/layouts/_default/taxonomy.html
@@ -8,8 +8,8 @@
 
 {{ define "content" }}
 	<div>
-	{{ range .Data.Pages }}
-		{{ . }}
-	{{ end }}
+    {{ range $.Site.Taxonomies.tags.ByCount }}
+        <a href="{{ (printf "/tags/%s" .Name) | relLangURL }}"> {{ .Name }} <small>({{ .Count }})</small></a>
+    {{ end }}
 	</div>
 {{ end }}
diff --git a/themes/buha/layouts/_default/term.html b/themes/buha/layouts/_default/term.html
new file mode 100644
index 0000000..90f9511
--- /dev/null
+++ b/themes/buha/layouts/_default/term.html
@@ -0,0 +1,12 @@
+{{ define "banner" }}
+    {{ $image := "" }}
+    {{ if .Resources.GetMatch "banner*" }}
+        {{ $image = .Resources.GetMatch "banner*" }}
+    {{ end }}
+    {{ partial "snippets/banner_new" (dict "context" . "image" $image "title" .Title "section" .Section) }}
+{{ end }}
+
+{{ define "content" }}
+	{{ $pages := .Data.Pages }}
+	{{ partial "snippets/gen_list" (dict "context" . "pages" $pages "content" .Content "type" .Type "paginate" true) }}
+{{ end }}
diff --git a/themes/buha/layouts/tags/list.html b/themes/buha/layouts/tags/list.html
deleted file mode 100644
index 9a4b817..0000000
--- a/themes/buha/layouts/tags/list.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{ define "banner" }}
-    {{ $image := "" }}
-    {{ if .Resources.GetMatch "banner*" }}
-        {{ $image = .Resources.GetMatch "banner*" }}
-    {{ end }}
-    {{ partial "snippets/banner_new" (dict "context" . "image" $image "title" .Title "section" .Section) }}
-{{ end }}
-
-{{ define "content" }}
-	{{ if eq .Kind "taxonomy" }}
-	<div>
-		{{ range .Data.Pages }}
-				<a href="{{ .Page.Permalink }}" class="underline" style="margin-right: 1rem;">{{ .Page.Title }} </a>
-		{{ end }}
-	</div>
-	{{ else }}
-		{{- $pages := .Data.Pages -}}
-		{{ partial "snippets/gen_list" (dict "context" . "pages" $pages "content" .Content "type" .Type "paginate" true) }}
-	{{ end }}
-{{ end }}