diff --git a/assets/scss/partials/widgets.scss b/assets/scss/partials/widgets.scss
index 42cfcc2c..b1b7b3eb 100644
--- a/assets/scss/partials/widgets.scss
+++ b/assets/scss/partials/widgets.scss
@@ -65,3 +65,11 @@
         }
     }
 }
+
+/* Color for widget titles */
+.widget-title a.widget-link {
+    color: var(--accent-color);
+    &:hover {
+        color: var(--accent-color-darker);
+    }
+}
diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml
index a87c9866..ef3afa04 100644
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@@ -74,16 +74,20 @@ type = "archives"
 limit = 5
 
 [[widgets.homepage]]
-type = "categories"
+type = "taxonomy"
 
 [widgets.homepage.params]
 limit = 10
+type = "tags"
+icon = "tag"
 
 [[widgets.homepage]]
-type = "tag-cloud"
+type = "taxonomy"
 
 [widgets.homepage.params]
 limit = 10
+type = "categories"
+icon = "categories"
 
 [[widgets.page]]
 type = "toc"
diff --git a/i18n/ar.yaml b/i18n/ar.yaml
index 61e02626..6e391e57 100644
--- a/i18n/ar.yaml
+++ b/i18n/ar.yaml
@@ -29,12 +29,6 @@ widget:
         title: الارشيفات
         more: اكثر
 
-    tagCloud:
-        title: وسوم
-
-    categoriesCloud:
-        title: التصنيفات
-
 search:
     title: بحث
     placeholder: اكتب...
diff --git a/i18n/bn.yaml b/i18n/bn.yaml
index 0e3e511f..ede587e2 100644
--- a/i18n/bn.yaml
+++ b/i18n/bn.yaml
@@ -35,10 +35,6 @@ widget:
     archives:
         title: আর্কাইভ
         more: আরও
-    tagCloud:
-        title: ট্যাগ
-    categoriesCloud:
-        title: বিভাগ
 
 search:
     title: অনুসন্ধান
diff --git a/i18n/ca.yaml b/i18n/ca.yaml
index da2428b8..7812049c 100644
--- a/i18n/ca.yaml
+++ b/i18n/ca.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Arxiu
         more: Més
-    tagCloud:
-        title: Etiquetes
-    categoriesCloud:
-        title: Categories
 
 search:
     title: Cerca
diff --git a/i18n/de.yaml b/i18n/de.yaml
index ff0e351a..f7b4c736 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Archiv
         more: Weitere
-    tagCloud:
-        title: Schlagwörter
-    categoriesCloud:
-        title: Kategorien
 
 search:
     title: Suche
diff --git a/i18n/el.yaml b/i18n/el.yaml
index 486914a5..3f478bc2 100644
--- a/i18n/el.yaml
+++ b/i18n/el.yaml
@@ -28,8 +28,6 @@ widget:
     archives:
         title: Αρχειο
         more: Περισσότερα
-    tagCloud:
-        title: Tags
 
 search:
     title: Αναζήτηση
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 3f94ab17..38ba63c7 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -31,10 +31,6 @@ widget:
     archives:
         title: Archives
         more: More
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categories
 
 search:
     title: Search
diff --git a/i18n/es.yaml b/i18n/es.yaml
index 5614e987..13f2c77a 100644
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Archivo
         more: Más
-    tagCloud:
-        title: Etiquetas
-    categoriesCloud:
-        title: Categorías
 
 search:
     title: Búsqueda
diff --git a/i18n/fa.yaml b/i18n/fa.yaml
index 9de30b52..bcefbe39 100644
--- a/i18n/fa.yaml
+++ b/i18n/fa.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: آرشیو
         more: بیشتر
-    tagCloud:
-        title: تگ ها
-    categoriesCloud:
-        title: دسته بندی
 
 search:
     title: جستجو
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
index f18805c5..ddc6224b 100644
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@@ -28,8 +28,6 @@ widget:
     archives:
         title: Archives
         more: Autres
-    tagCloud:
-        title: Mots clés
 
 search:
     title: Rechercher
diff --git a/i18n/hu.yaml b/i18n/hu.yaml
index 0e8c6e5c..8baf956f 100644
--- a/i18n/hu.yaml
+++ b/i18n/hu.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Archívum
         more: Több
-    tagCloud:
-        title: Cimkék
-    categoriesCloud:
-        title: Kategóriák
 
 search:
     title: Keresés
diff --git a/i18n/id.yaml b/i18n/id.yaml
index 42e94612..1f10ee10 100644
--- a/i18n/id.yaml
+++ b/i18n/id.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Arsip
         more: Lebih
-    tagCloud:
-        title: Tag
-    categoriesCloud:
-        title: Kategori
 
 search:
     title: Cari
diff --git a/i18n/it.yaml b/i18n/it.yaml
index 81f3fb48..9c4a0aae 100644
--- a/i18n/it.yaml
+++ b/i18n/it.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Archivi
         more: Di più
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categorie
 
 search:
     title: Cerca
diff --git a/i18n/ja.yaml b/i18n/ja.yaml
index 4a1c85ff..83c08852 100644
--- a/i18n/ja.yaml
+++ b/i18n/ja.yaml
@@ -17,10 +17,6 @@ widget:
     archives:
         title: アーカイブ
         more: さらに見る
-    tagCloud:
-        title: タグ
-    categoriesCloud:
-        title: カテゴリ
 
 search:
     title: 検索
diff --git a/i18n/ko.yaml b/i18n/ko.yaml
index 05c0530d..da8a88fc 100644
--- a/i18n/ko.yaml
+++ b/i18n/ko.yaml
@@ -28,12 +28,6 @@ widget:
     archives:
         title: 보관함
         more: 더보기
-            
-    categoriesCloud:
-        title: 카테고리
-            
-    tagCloud:
-        title: 태그
 
 search:
     title: 검색
diff --git a/i18n/nl.yaml b/i18n/nl.yaml
index 620d915d..ce8b4986 100644
--- a/i18n/nl.yaml
+++ b/i18n/nl.yaml
@@ -23,10 +23,6 @@ widget:
     archives:
         title: Archief
         more: Meer
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categorie
 
 search:
     title: Zoeken
diff --git a/i18n/pl.yaml b/i18n/pl.yaml
index fc27ccd1..ce508b71 100644
--- a/i18n/pl.yaml
+++ b/i18n/pl.yaml
@@ -34,11 +34,6 @@ widget:
     archives:
         title: Archiwum
         more: Więcej
-    tagCloud:
-        title: Tagi
-
-    categoriesCloud:
-        title: Kategorie
 
 search:
     title: Szukaj
diff --git a/i18n/pt-br.yaml b/i18n/pt-br.yaml
index b1235cb3..df63aae8 100644
--- a/i18n/pt-br.yaml
+++ b/i18n/pt-br.yaml
@@ -29,12 +29,6 @@ widget:
         title: Arquivos
         more: Mais
 
-    tagCloud:
-        title: Tags
-
-    categoriesCloud:
-        title: Categorias
-
 search:
     title: Busca
     placeholder: Digite algo...
diff --git a/i18n/pt-pt.yaml b/i18n/pt-pt.yaml
index f524969c..2b240750 100644
--- a/i18n/pt-pt.yaml
+++ b/i18n/pt-pt.yaml
@@ -45,12 +45,6 @@ widget:
             other: Arquivos
         more:
             other: Mais
-    tagCloud:
-        title:
-            other: Tags
-    categoriesCloud:
-        title:
-            other: Categorias
 
 search:
     title:
diff --git a/i18n/ru.yaml b/i18n/ru.yaml
index d04e8a31..8238d4d5 100644
--- a/i18n/ru.yaml
+++ b/i18n/ru.yaml
@@ -30,8 +30,6 @@ widget:
     archives:
         title: Архивы
         more: Ещё
-    tagCloud:
-        title: Теги
 
 search:
     title: Поиск
diff --git a/i18n/th.yaml b/i18n/th.yaml
index 81e54d33..e64ab2e0 100644
--- a/i18n/th.yaml
+++ b/i18n/th.yaml
@@ -28,8 +28,6 @@ widget:
     archives:
         title: เนื้อหาที่เก็บถาวรแล้ว
         more: อื่นๆ นอกจากนี้
-    tagCloud:
-        title: แท็ก
 
 search:
     title: ค้นหา
diff --git a/i18n/tr.yaml b/i18n/tr.yaml
index 0df564ac..2d4d1579 100644
--- a/i18n/tr.yaml
+++ b/i18n/tr.yaml
@@ -23,8 +23,6 @@ widget:
     archives:
         title: Arşiv
         more: Daha fazla
-    tagCloud:
-        title: Etiketler
 
 search:
     title: Arama
diff --git a/i18n/uk.yaml b/i18n/uk.yaml
index 2e29e269..21163b5b 100644
--- a/i18n/uk.yaml
+++ b/i18n/uk.yaml
@@ -29,8 +29,6 @@ widget:
     archives:
         title: Архіви
         more: Більше
-    tagCloud:
-        title: Теґи
 
 search:
     title: Пошук
diff --git a/i18n/vi.yaml b/i18n/vi.yaml
index 13dc624a..b1605b91 100644
--- a/i18n/vi.yaml
+++ b/i18n/vi.yaml
@@ -48,14 +48,6 @@ widget:
     more:
       other: Còn nữa
 
-  tagCloud:
-    title:
-      other: Nhãn dán
-
-  categoriesCloud:
-    title:
-      other: Chuỗi bài
-
 search:
   title:
     other: Tìm kiếm
diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml
index e744d08f..12a7ac63 100644
--- a/i18n/zh-cn.yaml
+++ b/i18n/zh-cn.yaml
@@ -17,10 +17,6 @@ widget:
     archives:
         title: 归档
         more: 更多
-    tagCloud:
-        title: 标签云
-    categoriesCloud:
-        title: 分类
 
 search:
     title: 搜索
diff --git a/i18n/zh-hk.yaml b/i18n/zh-hk.yaml
index 4f701baa..97f74764 100644
--- a/i18n/zh-hk.yaml
+++ b/i18n/zh-hk.yaml
@@ -28,10 +28,6 @@ widget:
     archives:
         title: Archives
         more: 更多
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categories
 
 search:
     title: 搜尋
diff --git a/i18n/zh-tw.yaml b/i18n/zh-tw.yaml
index 00fa4031..674734ff 100644
--- a/i18n/zh-tw.yaml
+++ b/i18n/zh-tw.yaml
@@ -29,10 +29,6 @@ widget:
     archives:
         title: 紀錄
         more: 更多
-    tagCloud:
-        title: 標籤雲
-    categoriesCloud:
-        title: 分類
 
 search:
     title: 搜尋
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 4e1e0b5f..a8a2620b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -11,7 +11,7 @@
         <div class="section-card">
             <div class="section-details">
                 <h3 class="section-count">{{ T "list.page" (len .Pages) }}</h3>
-                <h1 class="section-term">{{ .Title }}</h1>
+                <h1 class="section-term">{{ default (strings.FirstUpper .Type) .Title }}</h1>
                 {{ with .Params.description }}
                     <h2 class="section-description">{{ . }}</h2>
                 {{ end }}
diff --git a/layouts/partials/widget/archives.html b/layouts/partials/widget/archives.html
index e42da27d..106c57d7 100644
--- a/layouts/partials/widget/archives.html
+++ b/layouts/partials/widget/archives.html
@@ -7,7 +7,9 @@
         <div class="widget-icon">
             {{ partial "helper/icon" "infinity" }}
         </div>
-        <h2 class="widget-title section-title">{{ T "widget.archives.title" }}</h2>
+        <h2 class="widget-title section-title">
+            <a class="widget-link" href="{{ $archivesPage.RelPermalink }}">{{ T "widget.archives.title" }}</a>
+        </h2>
 
         {{ $pages := where $context.Site.RegularPages "Type" "in" $context.Site.Params.mainSections }}
         {{ $archives := $pages.GroupByDate "2006" }}
diff --git a/layouts/partials/widget/categories.html b/layouts/partials/widget/categories.html
deleted file mode 100644
index 10c8a35e..00000000
--- a/layouts/partials/widget/categories.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $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>
diff --git a/layouts/partials/widget/tag-cloud.html b/layouts/partials/widget/tag-cloud.html
deleted file mode 100644
index e64e5e2f..00000000
--- a/layouts/partials/widget/tag-cloud.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $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 }}" class="font_size_{{ .Count }}">
-                {{ .Page.Title }}
-            </a>
-        {{ end }}
-    </div>
-</section>
\ 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 00000000..baf51713
--- /dev/null
+++ b/layouts/partials/widget/taxonomy.html
@@ -0,0 +1,32 @@
+{{- $query := first 1 (where (where .Context.Site.Pages "Kind" "taxonomy") "Type" .Params.type) -}}
+{{- $context := .Context -}}
+{{- $limit := default 10 .Params.limit -}}
+{{- $hideInTaxonomyPage := default true .Params.hideInTaxonomyPage -}}
+{{- if $query -}}
+    {{- $taxonomyPage := index $query 0 -}}
+    {{- $isTaxonomyPage := eq .Context $taxonomyPage -}}
+    {{- if not (and $isTaxonomyPage $hideInTaxonomyPage) -}}
+        <section class="widget tagCloud">
+            <div class="widget-icon">
+                {{- partial "helper/icon" (default "tag" .Params.icon) -}}
+            </div>
+            <h2 class="widget-title section-title">
+                <a class="widget-link" href="{{ $taxonomyPage.RelPermalink }}">
+                    {{- default $taxonomyPage.Title .Params.title -}}
+                </a>
+            </h2>
+
+            <div class="tagCloud-tags">
+                {{- $pages := index $context.Site.Taxonomies .Params.type -}}
+                {{- $pagesSorted := $pages.ByCount -}}
+                {{- range first $limit $pagesSorted -}}
+                    <a href="{{ .Page.RelPermalink }}">
+                        {{- .Page.Title -}}
+                    </a>
+                {{- end -}}
+            </div>
+        </section>
+    {{- end -}}
+{{- else -}}
+    {{- warnf "Taxonomy [%s] not found." .Params.type -}}
+{{- end -}}
\ No newline at end of file