diff --git a/blogng.cabal b/blogng.cabal
index 677938f..729b714 100644
--- a/blogng.cabal
+++ b/blogng.cabal
@@ -6,7 +6,7 @@ cabal-version:      >= 1.10
 executable site
   main-is:          site.hs
   build-depends:    base == 4.*
-                  , hakyll >= 4.10.0
+                  , hakyll == 4.13.*
                   , filepath >= 1.4
                   , regex-compat
   ghc-options:      -threaded
diff --git a/css/theme.css b/css/theme.css
index ea47ed5..0aedcbf 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -13,13 +13,15 @@ html {
 
 #title {
     grid-column-start: 1;
-    font-size: 12pt;
+    font-size: 16pt;
+    font-style: bold;
     text-align: left;
 }
 
 #nav {
     grid-column-start: 2;
     text-align: right;
+    font-size: 16pt;
     font-variant: small-caps;
     word-spacing: 110%;
 }
@@ -29,9 +31,9 @@ body {
     font-family: 'IBM Plex Serif', serif;
     font-weight: 400;
     color: #454545;
-    font-size: 12pt;
+    font-size: 20px;
     margin: 2em auto;
-    max-width: 800px;
+    max-width: 1000px;
     padding: 1em;
     line-height: 1.4;
     text-align: left;
@@ -57,7 +59,7 @@ figure {
 }
 
 figcaption {
-    font-size: 8pt;
+    font-size: 15pt;
     text-align: center;
     font-family: serif;
 }
@@ -66,7 +68,7 @@ figcaption {
     display: inline-grid;
     grid-template-columns: auto auto;
     grid-template-rows: auto;
-    font-size: 10pt;
+    font-size: 14pt;
 }
 
 #date {
@@ -79,33 +81,38 @@ figcaption {
 }
 
 h1 {
-    font-size: 22pt;
-    font-weight: normal;
+    font-family: 'IBM Plex Mono', monospace;
+    font-size: 30pt;
+    font-weight: bold;
 }
 
 h2 {
-    font-size: 16pt;
+    font-family: 'IBM Plex Mono', monospace;
+    font-size: 22pt;
     margin-top: 1.5em;
     font-weight: bold;
 }
 
 
 h3 {
-    font-size: 14pt;
+    font-size: 20pt;
 }
 
 article > ul {
     padding-left: 0;
 }
 
-ul > li {
+article > ul > li {
     list-style: none;
+    font-size: 22pt;
+    padding-top: 22pt;
 }
 
-ul > li:before {
-  content: "—";
+section > ul > li {
+    padding-top: 22pt;
 }
 
+
 #footerdiv {
     margin-top: 50px;
 }
@@ -119,9 +126,13 @@ footer {
 a {
     color: #454545;
     font-weight: 430;
-    text-decoration-color: #808080;
+    border-bottom: 2px dashed #808080;
+    text-decoration: none;
 }
 
+a:hover {
+    border-bottom-color: red;
+
 sup > a {
     color: #454545;
     font-weight: 430;
diff --git a/site.hs b/site.hs
index 0df4f23..cf447b6 100644
--- a/site.hs
+++ b/site.hs
@@ -1,11 +1,11 @@
 --------------------------------------------------------------------------------
 {-# LANGUAGE OverloadedStrings #-}
-import           Data.Monoid (mappend)
-import           Hakyll
-import           Hakyll.Core.Identifier (toFilePath)
-import           Hakyll.Web.Feed
-import           System.FilePath
-import           Text.Regex (splitRegex, mkRegex)
+import Data.Monoid (mappend)
+import Hakyll
+import Hakyll.Core.Identifier (toFilePath)
+import Hakyll.Web.Feed
+import System.FilePath
+import Text.Regex (mkRegex, splitRegex)
 
 
 
@@ -65,7 +65,7 @@ main = hakyllWith config $ do
         compile $ do
             posts <- recentFirst =<< loadAll "blog/*"
             let indexCtx =
-                    listField "posts" postCtx (return $ take 8 posts) `mappend`
+                    listField "posts" (postCtxWTags tags) (return $ take 8 posts) `mappend`
                     constField "title" "Home"                `mappend`
                     tagsField  "tags" tags                   `mappend`
                     defaultContext
@@ -96,7 +96,7 @@ main = hakyllWith config $ do
         compile $ do
             posts <- recentFirst =<< loadAll pattern
             let ctx = constField "title" title
-                      `mappend` listField "posts" postCtx (return posts)
+                      `mappend` listField "posts" (postCtxWTags tags) (return posts)
                       `mappend` defaultContext
 
             makeItem ""
diff --git a/templates/default.html b/templates/default.html
index 6af0d05..c9859ea 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -13,7 +13,7 @@
       <header>
         <div class="header">
           <div id="title"><a href="/">BINARY STROLLS</a></div>
-          <div id="nav"><a href="/archive.html">Archive</a> <a href="https://dbalan.in">About</a></div>
+          <div id="nav"><a href="/archive.html">Archive</a>⬦<a href="https://dbalan.in">About</a></div>
         </div>
       </header>
         <section>
diff --git a/templates/post-list.html b/templates/post-list.html
index 339f884..41a56c0 100644
--- a/templates/post-list.html
+++ b/templates/post-list.html
@@ -1,7 +1,17 @@
-<ul>
+<ul id="postlist">
     $for(posts)$
     <li>
-      <a href="$url$">$title$</a> - $date$
+      <div>
+	<div>
+	  <a href="$url$">$title$</a>
+	</div>
+	<div class="postmeta"><div id="date">$date$</div>
+	  $if(tags)$
+	  <div id="tags">Posted in $tags$</div>
+	  $endif$
+	</div>
+      </div>
     </li>
     $endfor$
 </ul>
+</div>