diff --git a/layouts/_partials/widget/categories.html b/layouts/_partials/widget/categories.html
index 10c8a35..7179b77 100644
--- a/layouts/_partials/widget/categories.html
+++ b/layouts/_partials/widget/categories.html
@@ -1,16 +1,2 @@
-{{- $context := .Context -}}
-{{- $limit := default 10 .Params.limit -}}
-<section class="widget tagCloud">
-    <div class="widget-icon">
-        {{ partial "helper/icon" "categories" }}
-    </div>
-    <h2 class="widget-title section-title">{{ T "widget.categoriesCloud.title" }}</h2>
-
-    <div class="tagCloud-tags">
-        {{ range first $limit $context.Site.Taxonomies.categories.ByCount }}
-            <a href="{{ .Page.RelPermalink }}" class="font_size_{{ .Count }}">
-                {{ .Page.Title }}
-            </a>
-        {{ end }}
-    </div>
-</section>
+{{ $params := merge (dict "taxonomy" "categories" "title" (T "widget.categoriesCloud.title") "icon" "categories") .Params }}
+{{ partial "widget/taxonomy" (dict "Context" .Context "Params" $params) }}
\ No newline at end of file
diff --git a/layouts/_partials/widget/tag-cloud.html b/layouts/_partials/widget/tag-cloud.html
index 37edf52..88c3e46 100644
--- a/layouts/_partials/widget/tag-cloud.html
+++ b/layouts/_partials/widget/tag-cloud.html
@@ -1,16 +1,2 @@
-{{- $context := .Context -}}
-{{- $limit := default 10 .Params.limit -}}
-<section class="widget tagCloud">
-    <div class="widget-icon">
-        {{ partial "helper/icon" "tag" }}
-    </div>
-    <h2 class="widget-title section-title">{{ T "widget.tagCloud.title" }}</h2>
-
-    <div class="tagCloud-tags">
-        {{ range first $limit $context.Site.Taxonomies.tags.ByCount }}
-            <a href="{{ .Page.RelPermalink }}">
-                {{ .Page.Title }}
-            </a>
-        {{ end }}
-    </div>
-</section>
+{{ $params := merge (dict "taxonomy" "tags" "title" (T "widget.tagCloud.title") "icon" "tag") .Params }}
+{{ partial "widget/taxonomy" (dict "Context" .Context "Params" $params) }}
\ No newline at end of file
diff --git a/layouts/_partials/widget/taxonomy.html b/layouts/_partials/widget/taxonomy.html
new file mode 100644
index 0000000..cdb3e5b
--- /dev/null
+++ b/layouts/_partials/widget/taxonomy.html
@@ -0,0 +1,39 @@
+{{- $context := .Context -}}
+
+{{- if not .Params.taxonomy -}}
+    {{- warnf "Taxonomy field is required" -}}
+{{- end -}}
+
+{{- $taxonomy := index $context.Site.Taxonomies .Params.taxonomy -}}
+{{- if not $taxonomy -}}
+    {{- warnf "Taxonomy %s not found" .Params.taxonomy -}}
+{{- end -}}
+
+{{- $taxonomyPage := $taxonomy.Page -}}
+{{- $widgetTitle := .Params.title -}}
+{{- $limit := default 10 .Params.limit -}}
+{{- $icon := default .Params.taxonomy .Params.icon -}}
+{{- $showLink := default false .Params.showLink -}}
+
+<section class="widget tagCloud">
+    <div class="widget-icon">
+        {{ partial "helper/icon" $icon }}
+    </div>
+    <h2 class="widget-title section-title">
+        {{ if $showLink }}
+            <a href="{{ $taxonomyPage.RelPermalink }}">
+                {{ $widgetTitle }}
+            </a>
+        {{ else }}
+            {{ $widgetTitle }}
+        {{ end }}
+    </h2>
+
+    <div class="tagCloud-tags">
+        {{ range first $limit $taxonomy.ByCount }}
+            <a href="{{ .Page.RelPermalink }}">
+                {{ .Page.Title }}
+            </a>
+        {{ end }}
+    </div>
+</section>