diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000..9d37cdb
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,16 @@
+{{ partial "header.html" . }}
+<section class="main">
+    <div class="container">
+        <div class="content">
+            <div class="posts">
+                <div class="page-heading">Posts about {{ .Title }}</div>
+                <ul>
+                    {{ range .Data.Pages.ByPublishDate }}
+                        {{ partial "li.html" . }}
+                    {{ end }}
+                </ul>
+            </div>
+        </div>
+    </div>
+</section>
+{{ partial "footer.html" . }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index b8a2bd2..c2c063b 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -15,6 +15,14 @@
                         {{end}}
                     {{end}}
                     <div class="reading-time"><div class="middot"></div>{{ if eq 1 .ReadingTime }}{{ .ReadingTime }} minute read{{ else }}{{ .ReadingTime }} minutes read{{ end }}</div>
+                    <div class="tags">
+                        <ul>
+                          {{ range .Params.tags }}
+                            <div class="middot"></div>
+                            <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a> </li>
+                          {{ end }}
+                        </ul>
+                    </div>
                 </div>
             </div>
             <div class="markdown">
diff --git a/static/css/main.v0.9.1.css b/static/css/main.v0.9.1.css
index 6217fe1..47dae44 100644
--- a/static/css/main.v0.9.1.css
+++ b/static/css/main.v0.9.1.css
@@ -379,6 +379,7 @@ section.main .content .front-matter .meta {
 }
 section.main .content .front-matter .date,
 section.main .content .front-matter .author,
+section.main .content .front-matter .tags,
 section.main .content .front-matter .word-count,
 section.main .content .front-matter .reading-time .middot {
   display: none;
@@ -392,16 +393,41 @@ section.main .content .front-matter .middot {
 section.main .content .front-matter .middot:before {
   content: "•";
 }
+section.main .content .front-matter .tags ul {
+  display: -webkit-flex;
+  display: -moz-flex;
+  display: -ms-flexbox;
+  display: -ms-flex;
+  display: flex;
+  -webkit-flex-direction: row;
+  -moz-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-align-items: center;
+  -moz-align-items: center;
+  -ms-align-items: center;
+  align-items: center;
+}
+section.main .content .front-matter .tags ul li {
+  -webkit-transition: opacity 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
+  -moz-transition: opacity 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
+  -ms-transition: opacity 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
+  -o-transition: opacity 0.1s cubic-bezier(0.47, 0, 0.75, 0.72);
+}
+section.main .content .front-matter .tags ul li:hover {
+  opacity: 0.7;
+}
+section.main .content .front-matter .tags ul li a {
+  color: #666666;
+}
 @media (min-width: 600px) {
   section.main .content .front-matter .date,
   section.main .content .front-matter .author,
+  section.main .content .front-matter .tags,
   section.main .content .front-matter .word-count,
   section.main .content .front-matter .reading-time .middot {
     display: initial;
   }
-  section.main .content .title-container .initials {
-    display: none;
-  }
 }
 section.main .container.f04 {
   -webkit-justify-content: center;