diff --git a/config.toml.yaml b/config.toml.yaml
new file mode 100755
index 0000000..aee0701
--- /dev/null
+++ b/config.toml.yaml
@@ -0,0 +1,48 @@
+MetaDataFormat = "yaml"
+contentdir = "content"
+layoutdir = "layouts"
+publishdir = "public"
+builddrafts = false
+buildFuture = true
+pygmentsuseclasses = true
+baseurl = "https://jeremykidwell.info/"
+title = "jeremykidwell.info"
+Canonifyurls = true
+rssLimit = 20.0
+disableKinds = "taxonomyTerm"
+
+[taxonomy]
+category = "categories"
+
+[markup.goldmark.renderer]
+unsafe= true
+
+[menu]
+
+  [[menu.main]]
+  name = "Publications"
+  url = "/publications"
+  weight = 2.0
+
+  [[menu.main]]
+  name = "Resources"
+  url = "/resources"
+  weight = 3.0
+
+  [[menu.main]]
+  name = "Presentations"
+  url = "/presentations"
+  weight = 4.0
+
+  [[menu.main]]
+  name = "Teaching"
+  url = "/teaching"
+  weight = 5.0
+
+  [[menu.main]]
+  name = "Blog"
+  url = "/blog"
+  weight = 6.0
+
+[permalinks]
+blog = /blog/archives/:year/:month/:day/:slug
\ No newline at end of file
diff --git a/config.yaml b/config.yaml
deleted file mode 100755
index f278020..0000000
--- a/config.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-MetaDataFormat: "yaml"
-contentdir: "content"
-layoutdir: "layouts"
-publishdir: "public"
-builddrafts: false
-pygmentsuseclasses: true
-baseurl: "https://jeremykidwell.info/"
-indexes:
-  category: "categories"
-title: "jeremykidwell.info"
-CanonifyUrls: true
-menu:
-  main:
-      - Name: "Publications"
-        URL: "/publications"
-        Weight: 2
-      - Name: "Resources"
-        URL: "/resources"
-        Weight: 3
-      - Name: "Presentations"
-        URL: "/presentations"
-        Weight: 4
-      - Name: "Teaching"
-        URL: "/teaching"
-        Weight: 5
-      - Name: "Blog"
-        URL: "/blog"
-        Weight: 6
-permalinks:
-  blog: /blog/archives/:year/:month/:day/:slug
-  archive: /blog/archives/
-...
diff --git a/configyaml.old.yaml b/configyaml.old.yaml
new file mode 100755
index 0000000..e4db811
--- /dev/null
+++ b/configyaml.old.yaml
@@ -0,0 +1,33 @@
+---
+MetaDataFormat: "yaml"
+contentdir: "content"
+layoutdir: "layouts"
+publishdir: "public"
+builddrafts: false
+pygmentsuseclasses: true
+baseurl: "https://jeremykidwell.info/"
+indexes:
+  category: "categories"   
+title: "jeremykidwell.info"
+Canonifyurls: true
+menu:
+  main:
+      - name: "Publications"
+        url: "/publications"
+        weight: 2
+      - name: "Resources"
+        url: "/resources"
+        weight: 3
+      - name: "Presentations"
+        url: "/presentations"
+        weight: 4
+      - name: "Teaching"
+        url: "/teaching"
+        weight: 5
+      - name: "Blog"
+        url: "/blog"
+        weight: 6
+permalinks:
+  blog: /blog/archives/:year/:month/:day/:slug
+  archive: /blog/archives/
+...
diff --git a/content/_index.md b/content/_index.md
new file mode 100644
index 0000000..cdbd46e
--- /dev/null
+++ b/content/_index.md
@@ -0,0 +1,5 @@
+---
+title: ""
+date: 2019-12-07T10:31:04-05:00
+---
+
diff --git a/content/resources/_index.md b/content/resources/_index.md
index 28d7709..b93281d 100755
--- a/content/resources/_index.md
+++ b/content/resources/_index.md
@@ -1,6 +1,7 @@
 ---
+title: Resources
+description: Some useful tools and bits of software
 type: page
-title: "Resources"
 ---
 
 <em>As a scholar in the humanities, my research is non-traditional in that it draws on digital methods and resources quite frequently. This is in part because, prior to becoming an academic, I worked in the IT industry for several years. As a result, I can build a linux server, perform post-intrusion server security assessments, terminate fibre optic cables, parse through big (+geospatial) data sets using R, write code, and assemble computers  from parts. Given this industry experience (for more, see <a href="https://uk.linkedin.com/in/kidwellj" target="_blank" rel="noopener noreferrer">LinkedIn</a>) I like to serve as a bridge between scholars and practitioners in informatics and humanities, particularly on those tricky ethical issues that can often crop up and which can benefit from the insights of real experience and philosophical reflection. Whenever possible, my work is provided under an open Creative Commons license, so by all means please download and appropriate!</em>
diff --git a/layouts/index.html b/layouts/index.html
index ff73ed0..52bf1b5 100755
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -8,7 +8,7 @@
     <base href="{{ .Site.BaseURL }}">
     <title>{{ .Site.Title }}</title>
     <link rel="canonical" href="{{ .Permalink }}">
-    <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+    <link href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
 
     {{ partial "head_includes.html" . }}
   </head>
@@ -34,7 +34,7 @@
            <p></p>
          </div>
        </div>
-       {{ range first 4 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }}
+       {{ range first 5 ((where .Site.RegularPages.ByDate "Section" "blog").Reverse) }}
        <div class="units-row-end">
         <div class="unit-33 dateblock">
           <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3>
@@ -64,7 +64,7 @@
       <!-- First Pane -->
       <h3>Recent Papers</h3>
       <ul class="compact fa-ul">
-        {{ range first 5 (where .Data.Pages.ByDate "Section" "publications").Reverse }}
+        {{ range first 5 (where .Site.RegularPages.ByDate "Section" "publications").Reverse }}
         <li><i class="fa-li fa  {{ if eq .Type "unpublished" }}fa-file-o {{ else if eq .Params.kind "book" }}fa-book {{ else }}fa-file {{ end }} fa-fw" style="color:#03396c;font-size:80%;padding-top:6px;"></i> {{ .Params.citation | safeHTML }} 
           <a href="{{ .Permalink }}" class="badge badge-small">Abstract</a>
         {{ end }}
@@ -78,7 +78,7 @@
       <!-- Second Pane -->
       <h3>Recent &amp; Upcoming Presentations</h3>
       <ul class="compact fa-ul">
-        {{ range (where .Data.Pages.ByDate "Section" "presentations").Reverse }}
+        {{ range (where .Site.RegularPages.ByDate "Section" "presentations").Reverse }}
           {{ if (ge .Date.Unix now.Unix) }}
             {{ if (le .Date.Unix (add now.Unix 10368000)) }}
               <li><i class="fa-li fa fa-comment-o fa-fw" style="color:#b00;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><em>{{ .Title | safeHTML }}</em></a>, {{ .Params.host | safeHTML }} ({{ .Date.Format "2 January 2006" }}). {{ partial "comingsoon.html" . }}
@@ -99,7 +99,7 @@
       <!-- Third Pane -->
       <h3>Current Teaching</h3>			
       <ul class="compact fa-ul">
-        {{ range (where .Data.Pages.ByDate "Section" "teaching").Reverse }}
+        {{ range (where .Site.RegularPages.ByDate "Section" "teaching").Reverse }}
         {{ if (ge .Date.Unix now.Unix) }}
         {{ if (le .Date.Unix (add now.Unix 7776000)) }}
         <li><i class="fa-li fa fa-mortar-board fa-fw" style="color:#03396c;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><span class="caps">{{ .Title }}</span></a>, {{ .Date.Format "January" }}&ndash;{{ .Params.enddate | dateFormat "January 2006" }}.  {{ partial "comingsoon.html" . }}
@@ -107,7 +107,7 @@
         {{ end }}
         {{ end }}
         {{ end }}
-        {{ range (where .Data.Pages.ByDate "Section" "teaching").Reverse }}
+        {{ range (where .Site.RegularPages.ByDate "Section" "teaching").Reverse }}
         {{ if (le .Date.Unix now.Unix) }}
         {{ if (le now.Unix (add .Date.Unix .Params.duration)) }}
         <li><i class="fa-li fa fa-mortar-board fa-fw" style="color:#03396c;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><span class="caps">{{ .Title }}</span></a>, {{ .Date.Format "January" }}&ndash;{{ .Params.enddate | dateFormat "January 2006" }}. {{ partial "nowon.html" . }}
@@ -115,7 +115,7 @@
         {{ end }}
         {{ end }}
         {{ end }}
-        {{ range (where .Data.Pages.ByDate "Section" "teaching").Reverse }}
+        {{ range (where .Site.RegularPages.ByDate "Section" "teaching").Reverse }}
         {{ $classend := (add .Date.Unix .Params.duration) }}
         {{ if (ge now.Unix $classend ) }}
         {{ if (le now.Unix (add $classend 10368000)) }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 71131e7..6d513ac 100755
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -13,7 +13,7 @@
     <link rel="apple-touch-icon-precomposed" href="{{ .Site.BaseURL }}/apple-touch-icon.png">
     <link rel="shortcut icon" href="{{ .Site.BaseURL }}/favicon.ico" />
     <!-- RSS -->
-    <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+    <link href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
     <link rel="authorization_endpoint" href="https://indieauth.com/auth">
 </script>
 </head>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 3adcacb..8b9b896 100755
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,7 +8,7 @@
     <base href="{{ .Site.BaseURL }}">
     <title> {{ .Title }} </title>
     <link rel="canonical" href="{{ .Permalink }}">
-    {{ if .RSSLink }}<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Title }}" />{{ end }}
+    {{ if .OutputFormats.Get "RSS" }}<link href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" rel="alternate" type="application/rss+xml" title="{{ .Title }}" />{{ end }}
 
     {{ partial "head_includes.html" . }}
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
diff --git a/layouts/resources/single.html b/layouts/resources/single.html
new file mode 100644
index 0000000..b5bb85b
--- /dev/null
+++ b/layouts/resources/single.html
@@ -0,0 +1,31 @@
+{{ template "partials/header.html" . }}
+<body lang="en" itemscope itemtype="http://schema.org/Article">
+
+  <div id="topbar">
+    <div class="wrapper">
+      <header>
+        {{ template "partials/sidebar.html" . }}
+
+        {{ $baseurl := .Site.BaseURL }}
+      </header>
+    </div>
+  </div>
+
+  <div class="wrapper">
+    <div class="units-row">
+      <div class="unit-centered unit-80">  
+        <article class="post" id="content">
+        <h3>{{ .Title }}</h3>  
+        {{ .Content }}
+        </article>
+      </div>
+    </div>
+  </div>
+  <hr class="separator">
+  
+  {{ partial "whatisthis.html" . }}
+  
+  {{ partial "footer.html" . }}
+
+
+