diff --git a/templates/article.html b/templates/article.html
index fb51e12..a2ff08c 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -61,9 +61,9 @@
 
 		{%- if page.taxonomies -%}
 			{%- for name, taxon in page.taxonomies %}
-				<ul class="tags">
+				<ul class="taxonomies">
 					{%-for item in taxon -%}
-						<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
+						<li><a class="taxon" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 					{%- endfor %}
 				</ul>
 			{%- endfor -%}
diff --git a/templates/article_list.html b/templates/article_list.html
index d2abc11..7fcf2d6 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -35,8 +35,8 @@
 		{%- 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) -}}">
-				    {{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=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 -}}
 			    </a>
 			    <br />
 			{%- endfor %}
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index e049de0..b45437d 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -8,17 +8,17 @@
 {%- set taxon_name = taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
-	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
+	{{- macros_translate::translate(key='posts_with_taxon', default='Posts with $TAXON $TERM', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
 	<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
 </h1>
 
 <p>
 	<small>
-		<a href="{{ get_url(path='tags', lang=lang) }}">
-			{{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
+		<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
+			{{- macros_translate::translate(key="all_taxa", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 		</a>
 		<br />
-		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}
+		{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts', language_strings=language_strings) }}
 	</small>
 </p>