diff --git a/css/theme.css b/css/theme.css
index 2b25d73..4f1d221 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -1,12 +1,13 @@
 html {
-    background-color:#fefefe
+    background-color: #fefefe;
 }
 
 .header {
     display: grid;
     grid-template-columns: 70% 30%;
     grid-template-rows: auto;
-    font-family: Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif;
+    font-family: Seravek, "Gill Sans Nova", Ubuntu, Calibri, "DejaVu Sans",
+        source-sans-pro, sans-serif;
     font-weight: 500;
     font-size: 10pt;
 }
@@ -26,9 +27,9 @@ html {
     word-spacing: 110%;
 }
 
-
 body {
-    font-family: system-ui, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    font-family: system-ui, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
+        "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
     font-weight: 400;
     color: #454545;
     margin: 2em auto;
@@ -37,15 +38,24 @@ body {
     text-align: left;
 }
 
+a:hover {
+  color: #F4F4F4;
+  background-color: #AD2831;
+  text-decoration: none;
+}
+
+}
 blockquote {
     font-style: italic;
 }
 
-video, code {
+video,
+code {
     font-weight: normal;
     max-width: 98%;
     margin: 3em auto;
-    font-family: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;
+    font-family: ui-monospace, "Cascadia Code", "Source Code Pro", Menlo,
+        Consolas, "DejaVu Sans Mono", monospace;
 }
 
 img {
@@ -80,24 +90,33 @@ figcaption {
 }
 
 h1 {
-    font-family: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif;
+    font-family: Charter, "Bitstream Charter", "Sitka Text", Cambria, serif;
     font-size: 30pt;
     font-weight: bold;
 }
 
 h2 {
-
-    font-family: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif;
+    font-family: Charter, "Bitstream Charter", "Sitka Text", Cambria, serif;
     font-size: 22pt;
     margin-top: 1.5em;
     font-weight: bold;
 }
 
-
 h3 {
     font-size: 20pt;
 }
 
+ul.posts {
+    list-style-type: none;
+    padding: 0;
+}
+
+li.post {
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+    border-bottom: 3px solid black;
+}
+
 article > ul {
     padding-left: 0;
 }
@@ -112,7 +131,6 @@ section > ul > li {
     padding-top: 22pt;
 }
 
-
 #footerdiv {
     margin-top: 50px;
 }
@@ -126,10 +144,12 @@ a {
     color: #454545;
     font-weight: bold;
 }
-a:hover {
-    border-bottom-color: red;
-}
 
+h1 > a {
+    color: #AD2831;
+    text-decoration: none;
+
+}
 sup > a {
     color: #454545;
     font-weight: 430;
diff --git a/index.html b/index.html
index 18bff3e..3e15a77 100644
--- a/index.html
+++ b/index.html
@@ -2,10 +2,11 @@
 title: Home
 ---
 
-<article>
-  <h1>Recent Posts</h1>
-  
-  $partial("templates/post-list.html")$
-  
-  <p>…or you can find more in the <a href="/archive.html">archive</a>.</p>
-</article>
+<ul class="posts">
+  $for(posts)$
+
+  <li class="post">$body$</li>
+  $endfor$
+</ul>
+
+<p>…or you can find more in the <a href="/archive.html">archive</a>.</p>
diff --git a/site.hs b/site.hs
index 17ab615..e7735c5 100644
--- a/site.hs
+++ b/site.hs
@@ -55,11 +55,10 @@ main = hakyllWith config $ do
     match "index.html" $ do
         route idRoute
         compile $ do
-            posts <- recentFirst =<< loadAll "blog/*"
+            posts <- fmap (take 4) . recentFirst =<< loadAllSnapshots "blog/*" "content"
             let indexCtx =
-                    listField "posts" (postCtxWTags tags) (return $ take 8 posts) `mappend`
+                    listField "posts" postCtx (return $ take 8 posts) `mappend`
                     constField "title" "Home"                `mappend`
-                    tagsField  "tags" tags                   `mappend`
                     defaultContext
 
             getResourceBody
diff --git a/templates/post.html b/templates/post.html
index 640ed4c..6a22db2 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -1,12 +1,11 @@
 <article class="group">
-    <h1>$title$</h1>
-    <div class="postmeta"><div id="date">$date$</div>
+  <h1><a href="$url$">$title$</a></h1>
+  <div class="postmeta">
+    <div id="date">$date$</div>
     $if(tags)$
     <div id="tags">Posted in $tags$</div>
     $endif$
-    </div>
-    
-    <section>
-        $body$
-    </section>
+  </div>
+
+  <section>$body$</section>
 </article>