diff --git a/layouts/_default/category.html b/layouts/_default/category.html
new file mode 100644
index 0000000000000000000000000000000000000000..294ab6552d540367554abb590538360b236a6ad9
--- /dev/null
+++ b/layouts/_default/category.html
@@ -0,0 +1,19 @@
+{{ define "main" -}}
+<ul class="posts">
+  <h1>Category: {{ .Title }}</h1>
+  {{ $regularPages := .Data.Pages -}}
+  {{ $pagesNotHidden := where $regularPages ".Params.hidden" "==" false }}
+  {{ $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil }}
+
+  {{ $pages := $pagesNotHidden | union $pagesHiddenUnset }}
+
+  {{ range $pages -}}
+  <li>
+    <span>
+        <a href="{{ .Permalink }}">{{ .Title }}</a>
+        <time class="pull-right post-list" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time>
+    </span>
+  </li>
+  {{- end }}
+</ul>
+{{- end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b5b6ed31030e610fa3bd0db4f98a0998b3a83b5e..665318daba9ea0eab3024b956da5c8c21a7296ed 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,11 +1,19 @@
 {{ define "main" -}}
 <ul class="posts">
   <h1>{{ .Title }}</h1>
-  {{ range .Data.Pages -}}
+  {{ $regularPages := .Data.Pages -}}
+  {{ $pagesNotHidden := where $regularPages ".Params.hidden" "==" false }}
+  {{ $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil }}
+
+  {{ $pages := $pagesNotHidden | union $pagesHiddenUnset }}
+
+  {{ range $pages -}}
   <li>
     <span>
         <a href="{{ .Permalink }}">{{ .Title }}</a>
+        {{ if eq .Kind "page" }}
         <time class="pull-right post-list" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time>
+        {{ end }}
     </span>
   </li>
   {{- end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000000000000000000000000000000000000..d9be653c73cbab4b6d29b0cf2c1c688d87b2916a
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,19 @@
+{{ define "main" -}}
+<ul class="posts">
+  <h1>Tag: {{ .Title }}</h1>
+  {{ $regularPages := .Data.Pages -}}
+  {{ $pagesNotHidden := where $regularPages ".Params.hidden" "==" false }}
+  {{ $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil }}
+
+  {{ $pages := $pagesNotHidden | union $pagesHiddenUnset }}
+
+  {{ range $pages -}}
+  <li>
+    <span>
+        <a href="{{ .Permalink }}">{{ .Title }}</a>
+        <time class="pull-right post-list" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time>
+    </span>
+  </li>
+  {{- end }}
+</ul>
+{{- end }}