diff --git a/_config.yml b/_config.yml
index 2f03e74..bcde8b4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,14 +1,14 @@
-# Site settings
-title: Your awesome title
-email: your-email@domain.com
-description: > # this means to ignore newlines until "baseurl:"
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
-baseurl: "" # the subpath of your site, e.g. /blog/
-url: "http://yourdomain.com" # the base hostname & protocol for your site
-twitter_username: jekyllrb
-github_username:  jekyll
-
 # Build settings
+baseurl: "" # the subpath of your site, e.g. /blog/
+url: "http://liquidmarkup.org" # the base hostname & protocol for your site
 markdown: kramdown
+collections:
+  filters:
+    output: true
+
+defaults:
+  -
+    scope:
+      type: filters
+    values:
+      layout: page
diff --git a/_data/site.yml b/_data/site.yml
new file mode 100644
index 0000000..9c60ea9
--- /dev/null
+++ b/_data/site.yml
@@ -0,0 +1,6 @@
+# Site settings
+title: Liquid Templating Engine
+description: > # this means to ignore newlines until "baseurl:"
+  Liquid is a template language and accompanying rendering engine.
+  It is built for security, so is perfect for rendering custom
+  templates from your users.
diff --git a/_includes/footer.html b/_includes/footer.html
index 9944f68..f17a4e4 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,13 +2,12 @@
 
   <div class="wrapper">
 
-    <h2 class="footer-heading">{{ site.title }}</h2>
+    <h2 class="footer-heading">{{ site.data.site.title }}</h2>
 
     <div class="footer-col-wrapper">
       <div class="footer-col  footer-col-1">
         <ul class="contact-list">
-          <li>{{ site.title }}</li>
-          <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
+          <li>{{ site.data.site.title }}</li>
         </ul>
       </div>
     </div>
diff --git a/_includes/head.html b/_includes/head.html
index df8b5a5..9a126ca 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,8 +3,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
-  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+  <title>{% if page.title %}{{ page.title }} – {% endif %}{{ site.data.site.title }}</title>
+  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.data.site.description }}{% endif %}">
 
   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
   <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
diff --git a/_layouts/default.html b/_layouts/default.html
index ed90a1b..929ea56 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,14 +8,15 @@
       <h1 class="sidebar--logo"><a href="/">Liquid</a></h1>
       <nav class="sidebar--nav">
         <ul>
-          <li><a href="#">Nav Item 1</a>
+          {% for collection in site.collections %}
+          <li>{{ collection[0] | capitalize }}
             <ul>
-              <li><a href="#">Sub Nav Item 1</a></li>
-              <li><a href="#">Sub Nav Item 2</a></li>
-              <li><a href="#">Sub Nav Item 3 (Active)</a></li>
-              <li><a href="#">Sub Nav Item 4</a></li>
+              {% for doc in collection[1].docs %}
+              <li><a href="{{ doc.url | prepend: site.baseurl }}">{{ doc.title }}</a></li>
+              {% endfor %}
             </ul>
           </li>
+          {% endfor %}
           <li><a href="#">Nav Item 2</a></li>
           <li><a href="#">Nav Item 3</a></li>
           <li><a href="#">Nav Item 4</a></li>
diff --git a/about.md b/about.md
deleted file mode 100644
index 3ed64bb..0000000
--- a/about.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: About
-permalink: /about/
----
-
-This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
-
-You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
-
-You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
diff --git a/feed.xml b/feed.xml
index a6628bd..3aede08 100644
--- a/feed.xml
+++ b/feed.xml
@@ -4,8 +4,8 @@ layout: null
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>{{ site.title | xml_escape }}</title>
-    <description>{{ site.description | xml_escape }}</description>
+    <title>{{ site.data.site.title | xml_escape }}</title>
+    <description>{{ site.data.site.description | xml_escape }}</description>
     <link>{{ site.url }}{{ site.baseurl }}/</link>
     <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
     <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>