5 files changed, 22 insertions, 36 deletions

diff --git a/templates/base.html b/templates/base.html
index 0856b47..225ef3f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,9 +15,6 @@
     $if(keywords)$
         <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
     $endif$
-    $-- $if(feed.url.abs)$
-    $--     <link href="$feed.url.abs$" type="application/atom+xml" rel="alternate" title="$if(is_home)$$else$$title$ – $endif$$site.title$" />
-    $-- $endif$
     $for(feeds)$
         <link href="$it.url$" type="application/atom+xml" rel="alternate" title="$it.title$ – $site.title$" />
     $endfor$
@@ -50,16 +47,12 @@
                 <header class="c-page-header u-hidden@sm-down" role="presentation">
 ${partials/pageHeader()}
                 </header>
-            $endif$
 
-            $if(is_home)$
 ${page()}
-            $else$
-                $if(pages)$
+            $elseif(pages)$
 ${list()}
-                $else$
+            $else$
 ${page()}
-                $endif$
             $endif$
         </div>
     </main>
diff --git a/templates/list.html b/templates/list.html
index 3522754..4d62d47 100644
--- a/templates/list.html
+++ b/templates/list.html
@@ -1,4 +1,22 @@
 $body$
 
-${partials/categoriesById()}
-${partials/pagelistByYear()}
+$if(categories.by_id)$
+    <ul class="c-hlist">
+        $for(categories.by_id)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong> $it.value.name$</li>
+        $endfor$
+    </ul>
+$endif$
+
+$for(pages)$
+    $for(it.by_year)$
+        <ul>
+            $for(it.value)$
+                <li class="c-page__prefixed c-page__prefixed--ref">
+                    <a href="$it.url.rel$">$it.category/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
+                </li>
+            $endfor$
+        </ul>
+    $endfor$
+$endfor$
+
diff --git a/templates/partials/categoriesByCount.html b/templates/partials/categoriesByCount.html
deleted file mode 100644
index 9388cf9..0000000
--- a/templates/partials/categoriesByCount.html
+++ /dev/null
@@ -1,7 +0,0 @@
-$if(categories.by_count)$
-    <ul class="c-hlist">
-        $for(categories.by_count)$
-            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong> $it.value.name$</li>
-        $endfor$
-    </ul>
-$endif$
diff --git a/templates/partials/categoriesById.html b/templates/partials/categoriesById.html
deleted file mode 100644
index fc11cc2..0000000
--- a/templates/partials/categoriesById.html
+++ /dev/null
@@ -1,7 +0,0 @@
-$if(categories.by_id)$
-    <ul class="c-hlist">
-        $for(categories.by_id)$
-            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong> $it.value.name$</li>
-        $endfor$
-    </ul>
-$endif$
diff --git a/templates/partials/pagelistByYear.html b/templates/partials/pagelistByYear.html
deleted file mode 100644
index ff55f0f..0000000
--- a/templates/partials/pagelistByYear.html
+++ /dev/null
@@ -1,11 +0,0 @@
-$for(pages)$
-    $for(it.by_year)$
-        <ul>
-            $for(it.value)$
-                <li class="c-page__prefixed c-page__prefixed--ref">
-                    <a href="$it.url.rel$">$it.category/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
-                </li>
-            $endfor$
-        </ul>
-    $endfor$
-$endfor$