diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 3523907..e34caa1 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1 +1 @@
-<!-- This theme is not supported list page -->
+{{ template "theme/index.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 9a5eb5c..bf03de8 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,6 +2,11 @@
 {{ partial "nav" . }}
 <section class="section">
   <div class="container">
+    <div class="subtitle is-6 is-pulled-right">
+      {{ if .Params.tags }}
+      {{ partial "tags" .Params.tags }}
+      {{ end }}
+    </div>
     <h2 class="subtitle is-6">{{ .Date.Format "January 2, 2006" }}</h2>
     <h1 class="title">{{ .Title }}</h1>
     <div class="content">
diff --git a/layouts/index.html b/layouts/index.html
index b21c6fb..538bce0 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -4,6 +4,11 @@
   <div class="container">
     {{ range sort .Paginator.Pages }}
     <article>
+      <div class="subtitle is-6 is-pulled-right">
+        {{ if .Params.tags }}
+        {{ partial "tags" .Params.tags }}
+        {{ end }}
+      </div>
       <h2 class="subtitle is-6">{{ .Date.Format "January 2, 2006" }}</h2>
       <h1 class="title"><a href="{{ .Permalink }}">{{ .Title }}</a>{{ if .Draft }} ::Draft{{ end }}</h1>
       <div class="content">
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
new file mode 100644
index 0000000..721ec8c
--- /dev/null
+++ b/layouts/partials/tags.html
@@ -0,0 +1,9 @@
+{{ range first 1 . }}
+<a class="subtitle is-6" href="{{ "/tags/" | relURL }}{{ . | urlize }}">#{{ . }}</a>
+{{ end }}
+
+{{ if gt (len .) 1 }}
+  {{ range after 1 . }}
+  | <a class="subtitle is-6" href="{{ "/tags/" | relURL }}{{ . | urlize }}">#{{ . }}</a>
+  {{ end }}
+{{ end }}