9 files changed, 12 insertions, 7 deletions

diff --git a/templates/base.html b/templates/base.html
index 48d7c72..76dd0ba 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -45,22 +45,21 @@
         <div class="c-page__content">
             $if(is_home)$
                 <header class="c-page-header u-hidden@sm-down" role="presentation">
-${pageHeader()}
+${partials/pageHeader()}
                 </header>
             $endif$
 
-$body$
-
-            $if(section.is_blog)$
-                ${categoriesById()}
-                ${pagelistByYear()}
+            $if(pages)$
+${list()}
+            $else$
+${page()}
             $endif$
         </div>
     </main>
 
     $if(is_home)$
         <template id="header-sm">
-${pageHeaderSm()}
+${partials/pageHeaderSm()}
         </template>
 
         <script>
diff --git a/templates/feed.xml b/templates/feed.xml
index f1439eb..d760b04 100644
--- a/templates/feed.xml
+++ b/templates/feed.xml
@@ -42,6 +42,7 @@
                     <link href="$it.url.full$"/>
                     <published>$it.date.rfc3339$</published>
                     <updated>$it.date.rfc3339$</updated>
+                    $-- <content>$it.plain$</content>
                 </entry>
             $endif$
         $endfor$
diff --git a/templates/list.html b/templates/list.html
new file mode 100644
index 0000000..3522754
--- /dev/null
+++ b/templates/list.html
@@ -0,0 +1,4 @@
+$body$
+
+${partials/categoriesById()}
+${partials/pagelistByYear()}
diff --git a/templates/page.html b/templates/page.html
new file mode 100644
index 0000000..36d66c2
--- /dev/null
+++ b/templates/page.html
@@ -0,0 +1 @@
+$body$
diff --git a/templates/categoriesByCount.html b/templates/partials/categoriesByCount.html
index 871e3db..871e3db 100644
--- a/templates/categoriesByCount.html
+++ b/templates/partials/categoriesByCount.html
diff --git a/templates/categoriesById.html b/templates/partials/categoriesById.html
index 1f4f433..1f4f433 100644
--- a/templates/categoriesById.html
+++ b/templates/partials/categoriesById.html
diff --git a/templates/pageHeader.html b/templates/partials/pageHeader.html
index b44f394..b44f394 100644
--- a/templates/pageHeader.html
+++ b/templates/partials/pageHeader.html
diff --git a/templates/pageHeaderSm.html b/templates/partials/pageHeaderSm.html
index 4db186c..4db186c 100644
--- a/templates/pageHeaderSm.html
+++ b/templates/partials/pageHeaderSm.html
diff --git a/templates/pagelistByYear.html b/templates/partials/pagelistByYear.html
index ff55f0f..ff55f0f 100644
--- a/templates/pagelistByYear.html
+++ b/templates/partials/pagelistByYear.html