diff --git a/templates/article.html b/templates/article.html
index a2ff08c..ce1be1f 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -61,11 +61,13 @@
 
 		{%- if page.taxonomies -%}
 			{%- for name, taxon in page.taxonomies %}
-				<ul class="taxonomies">
-					{%-for item in taxon -%}
-						<li><a class="taxon" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
+				<ul class="tags">
+					<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
+					{%- for item in taxon -%}
+					    <li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 					{%- endfor %}
 				</ul>
+				<br />
 			{%- endfor -%}
 		{%- endif %}
 	</div>
diff --git a/templates/article_list.html b/templates/article_list.html
index 7fcf2d6..f6e102a 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -34,14 +34,14 @@
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- for taxon in config.taxonomies -%}
-		        {%- set taxon_name = taxon.name -%}
-			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
-					{{- macros_translate::translate(key='filter_by_tag', default='Filter by $TAXON', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | capitalize -}}
+			    {%- set taxon_name = taxon.name -%}
+			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon.name) | lower -}}">
+					{{ macros_translate::translate(key='filter_by_taxon', default='Filter by $TAXON', language_strings=language_strings) | replace(from="$TAXON", to=taxon.name) }}
 			    </a>
 			    <br />
 			{%- endfor %}
 		{%- endif %}
-		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts in total", language_strings=language_strings) }}
+		{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts in total', language_strings=language_strings) }}
 	</small>
 </p>
 
diff --git a/templates/partials/articles.html b/templates/partials/articles.html
index 92180b4..8eaa786 100644
--- a/templates/partials/articles.html
+++ b/templates/partials/articles.html
@@ -53,7 +53,8 @@
 						{%- for name, taxon in page.taxonomies %}
 							<small>
 								<ul class="tags">
-									{%-for item in taxon -%}
+									<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
+									{%- for item in taxon -%}
 										<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 									{%- endfor %}
 								</ul>