diff --git a/config.toml b/config.toml
index 0f57afe..4612543 100644
--- a/config.toml
+++ b/config.toml
@@ -3,6 +3,7 @@ languageCode = "en-us"
 title = "zero-knowledge"
 theme = "zero"
 SectionPagesMenu = "main"
+Paginate = 12
 
 [taxonomies]
   author = "author"
diff --git a/themes/zero/layouts/_default/list.html b/themes/zero/layouts/_default/list.html
index 6232de8..8733fbe 100644
--- a/themes/zero/layouts/_default/list.html
+++ b/themes/zero/layouts/_default/list.html
@@ -1,3 +1,3 @@
 {{ partial "header.html" . }}
-  {{ partial "li" . }}
+  {{ partial "li" .Paginator }}
 {{ partial "footer.html" . }}
diff --git a/themes/zero/layouts/_default/si.html b/themes/zero/layouts/_default/si.html
index c00b047..f0330f6 100644
--- a/themes/zero/layouts/_default/si.html
+++ b/themes/zero/layouts/_default/si.html
@@ -2,7 +2,7 @@
     <header>
       <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
     </header>
-    <aside>
+    <nav>
       {{ if .PrevInSection }}
       <a href="{{ .PrevInSection.Permalink }}">prev</a>
       {{ else }}
@@ -13,6 +13,10 @@
       {{ else }}
       <a href="" class="deactivated">next</a>
       {{ end }}
+    </nav>
+    <aside>
+      <span class="author">{{ .Params.author }}</span>
+      <span class="date">{{ dateFormat "2006-01-02 15:04" .Date }}</span>
     </aside>
     <section>
       {{ .Content }}
diff --git a/themes/zero/layouts/index.html b/themes/zero/layouts/index.html
index f5896b1..7c958ec 100644
--- a/themes/zero/layouts/index.html
+++ b/themes/zero/layouts/index.html
@@ -1,10 +1,3 @@
 {{ partial "header.html" . }}
-  <ul class="entries">
-    {{ range first 10 (where .Data.Pages "Section" "post") }}
-      <li>
-        {{ .Render "summary" }}
-      </li>
-    {{ end }}
-  </ul>
-  <a href="{{ "post" | absURL }}">older posts</a>
+{{ partial "li.html" (.Paginate (where .Data.Pages "Section" "post")) }}
 {{ partial "footer.html" . }}
diff --git a/themes/zero/layouts/partials/header.html b/themes/zero/layouts/partials/header.html
index 497acb6..d0f4db9 100644
--- a/themes/zero/layouts/partials/header.html
+++ b/themes/zero/layouts/partials/header.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>{{ if eq .URL "/" }}{{ .Site.Title }}{{ else }}{{ .Title }} - {{ .Site.Title }}{{ end }}</title>
+    <link href="{{ .Site.BaseURL }}/style.css" rel="stylesheet" type="text/css"></link>
   </head>
   <body>
     <haeder>
diff --git a/themes/zero/layouts/partials/li.html b/themes/zero/layouts/partials/li.html
index c828330..abf7beb 100644
--- a/themes/zero/layouts/partials/li.html
+++ b/themes/zero/layouts/partials/li.html
@@ -1,18 +1,17 @@
-This should work, right?
-  {{ if .Paginator.HasPrev }}
-  <a href="{{ .Paginator.Prev.URL }}">prev</a>
+  {{ if .HasPrev }}
+  <a href="{{ .Prev.URL }}">prev</a>
   {{ else }}
   <a href="" class="deactivated">prev</a>
   {{ end }}
   <ul class="entries">
-    {{ range .Paginator.Pages }}
+    {{ range .Pages }}
       <li>
         {{ .Render "summary" }}
       </li>
     {{ end }}
   </ul>
-  {{ if .Paginator.HasNext }}
-  <a href="{{ .Paginator.Next.URL }}">next</a>
+  {{ if .HasNext }}
+  <a href="{{ .Next.URL }}">next</a>
   {{ else }}
   <a href="" class="deactivated">next</a>
   {{ end }}
