diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 6d9d7e4..0be2446 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,7 +10,7 @@
             <header> 
                 <h2 class="post-title{{ if .Params.favorite }} favorite{{end}}"><a href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h2>
             </header>
-            {{ partial "postInfoFull.html" . }}
+            {{ partial "postInfo.html" . }}
         </div>
     {{ end }}
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index c53e9e3..775a2f6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,7 +7,7 @@
         <div class="content">
             {{ .Content }}
         </div>
-        {{ partial "postInfoFull.html" . }}
+        {{ partial "postInfo.html" . }}
     </article>
     {{ if .Site.DisqusShortname }}
         {{ template "_internal/disqus.html" . }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000..f63b535
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,11 @@
+{{ define "main" }}
+    <h1>{{ i18n .Data.Singular | humanize }}: {{ .Title }}</h1>
+    <div class="post-info">
+        <a href="{{ (printf "%s/%s" .Site.LanguagePrefix .Data.Plural) | absLangURL }}">{{ i18n (printf "toAll%s" (.Data.Plural | humanize )) | humanize }}</a>
+    </div>
+    {{ range .Paginator.Pages }}
+        {{ partial "postSummary.html" . }}
+    {{ end }}
+    {{ partial "pagination.html" . }}
+
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 16f8473..b0f98da 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,19 +1,15 @@
 {{ if or ( .Paginator.HasPrev ) ( .Paginator.HasNext ) }}
     {{ $toNewPostsMessage := i18n "toNewPosts" | humanize }}
-    {{ $toOldPostsMessage := i18n "toOldPosts" | humanize }}
+    {{ $toOldPostsMessage := i18n "toOldPosts" | humanize }}    
     <div class="pagination">
         <div class="left pagination-item {{ if not .Paginator.HasPrev }}disabled{{ end }}">
             {{ if .Paginator.HasPrev }}
-                {{ if eq .Paginator.PageNumber 2 }}
-                <a href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix}}">{{ $toNewPostsMessage }}</a>
-                {{ else }}
                 <a href="{{ .Paginator.Prev.URL | relLangURL }}">{{ $toNewPostsMessage }}</a>
-                {{ end }}
             {{ end }}
         </div>
         <div class="right pagination-item {{ if not .Paginator.HasNext }}disabled{{ end }}">
             {{ if .Paginator.HasNext }}
-            <a href="{{ .Paginator.Next.URL | relLangURL }}">{{ $toOldPostsMessage }}</a>
+                <a href="{{ .Paginator.Next.URL | relLangURL }}">{{ $toOldPostsMessage }}</a>
             {{ end }}
         </div>
     </div>
diff --git a/layouts/partials/postInfoFull.html b/layouts/partials/postInfo.html
similarity index 100%
rename from layouts/partials/postInfoFull.html
rename to layouts/partials/postInfo.html
diff --git a/layouts/partials/postSummary.html b/layouts/partials/postSummary.html
index 36be764..0c28f61 100644
--- a/layouts/partials/postSummary.html
+++ b/layouts/partials/postSummary.html
@@ -12,5 +12,5 @@
         </div>
     {{ end }} -->
     
-    {{ partial "postInfoFull.html" . }}
+    {{ partial "postInfo.html" . }}
 </article>
\ No newline at end of file
diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html
deleted file mode 100644
index 49ef285..0000000
--- a/layouts/taxonomy/category.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ define "main" }}
-
-    <h1>{{ i18n "category" | humanize }}: {{ .Title }}</h1>
-    <div class="post-info">
-        <a href="{{ "categories/" | absLangURL }}">{{ i18n "toAllCategories" | humanize }}</a>
-    </div>
-    {{ range .Data.Pages }}
-        {{ partial "postSummary.html" . }}
-    {{ end }}
-
-{{ end }}
\ No newline at end of file
diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html
deleted file mode 100644
index 953f64e..0000000
--- a/layouts/taxonomy/tag.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ define "main" }}
-
-    <h1>{{ i18n "tag" | humanize }}: {{ .Title }}</h1>
-    <div class="post-info">
-        <a href="{{ "tags/" | absURL }}">{{ i18n "toAllTags" | humanize}}</a>
-    </div>
-    {{ range .Data.Pages }}
-        {{ partial "postSummary.html" . }}
-    {{ end }}
-
-{{ end }}
\ No newline at end of file