diff --git a/README.md b/README.md
index 79b17a8..71f1777 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ It is a work in progress for sure.  Right now we are working the kicking off the
 
 ## Contribute to the Discussion
 
-Join us in the [Open Source Design Gitter channel](https://gitter.im/DesignOpen/OpenSourceDesign) and make some comments in the [GitHub issues](https://github.com/DesignOpen/designopen.github.io/issues).
+Join us in the [The Open Design Foundation Gitter channel](https://gitter.im/DesignOpen/OpenSourceDesign) and make some comments in the [GitHub issues](https://github.com/DesignOpen/designopen.github.io/issues).
 
 We do have a [Slack Team](http://osd.slack.com), but is not going to be useful/interesting to everyone; it is where we do some initial thinking around ideas before the discussion gets serious. As soon as it does we move it to [GitHub issues](https://github.com/DesignOpen/designopen.github.io/issues) which is a better place for meaningful discussion.
 
diff --git a/Rakefile b/Rakefile
index 0e3300b..a3e90c7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -228,7 +228,7 @@ end
 # rake lint
 desc "Markdown Lint"
 task :markdown_lint do
-  sh "bundle exec mdl ./ -r ~MD002,~MD013,~MD026,~MD028,~MD029,~MD033,~MD034"
+  sh "bundle exec mdl ./ -r ~MD002,~MD013,~MD026,~MD028,~MD029,~MD032,~MD033,~MD034"
 end
 
 desc "All lints"
diff --git a/_config.yml b/_config.yml
index aba7874..d0c41ef 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,12 +1,23 @@
+name: Open Design Foundation
+description: We think the best way to improve the design industry is to work in the open.
+url: http://opendesign.foundation
 permalink: /:categories/:title/
 highlighter: rouge
-url: http://opendesign.foundation
-name: Open Source Design
 excerpt_separator: <!--more-->
 markdown: kramdown
 gems:
   - jekyll-sitemap
-exclude: [vendor]
+  - jekyll-feed
+exclude:
+  - vendor
+  - Gemfile
+  - Gemfile.lock
+  - Guardfile
+  - Rakefile
+  - README.md
+  - CONTRIBUTING.md
+  - LICENSE
+  - CNAME
 sass:
   sass_dir: _sass
   style: compressed
@@ -16,77 +27,13 @@ compress_html:
   endings: all
   comments: ["<!--", "-->"]
 post:
-  template: _post.txt
+  template: _templates/post.txt
   extension: md
 resource:
-  template: _resource.txt
+  template: _templates/resource.txt
   extension: md
 page:
-  template: _page.txt
+  template: _templates/page.txt
   extension: md
-authors:
-  una:
-    display_name: Una Kravets
-    gravatar: 732b3562b0496389b40e548918c38f98
-    email: una.kravets@gmail.com
-    web: http://unakravets.com/
-    twitter: una
-    github: una
-    bio: 'UI engineer <a href="http://do.co/welcome">DigitalOcean</a>. Community builder, technical writer, & cohost of <a href="http://toolsday.io">Toolsday</a>.'
-  garthdb:
-    display_name: Garth Braithwaite
-    gravatar: b5cf6e112eeee572d722743dea924487
-    email: garthdb@gmail.com
-    web: http://www.garthdb.com/
-    twitter: garthdb
-    github: garthdb
-    bio: 'Product Designer? and Front End Developer on <a href="http://phonegap.com">PhoneGap</a> at <a href="http://adobe.com">Adobe</a>. <a href="http://opendesign.foundation">The Open Design Foundation</a> Founder.'
-  ttimsmith:
-    display_name: Tim Smith
-    gravatar: febbffcb54abe1be1435720fc2268237
-    email: smith@ttimsmith.com
-    web: http://theboldreport.net
-    twitter: ttimsmith
-    github: ttimsmith
-    bio: 'Designer who codes, blabber mouth, and coffee addict.'
-  areus:
-    display_name: Areus Wade
-    gravatar: 3a88629dd9417c822b68af4af685b782
-    email: hi@areuswade.com
-    web: http://areuswade.com
-    twitter: areus
-    github: areus
-    bio: 'Designer in San Diego building <a href="http://areus.co/pctg">precomposed stuff</a>.'
-  terracomma:
-    display_name: Christopher Moody
-    gravatar: 80d7c270dfac1d947d2b3fd39bf70b6a
-    email: terracomma@gmail.com
-    web: http://moody.coffee/
-    twitter: terracomma
-    github: terracomma
-    bio: 'Designer & Developer. Product designer at IBM. Core Contributor <a href="http://opendesign.foundation/">The Open Design Foundation</a>. Licensed Intoxicologist.'
-  vitorio:
-    display_name: Vitorio Miliano
-    gravatar: 1b2ea3fc983558c15216a609af35f709
-    email: email_re_designers_opensource@vitor.io
-    web: http://vitor.io
-    twitter: vitor_io
-    github: vitorio
-    bio: 'User experience and interaction designer. I like talking about genuine outbreaks of the future.'
-  mrondina:
-    display_name: Mark Rondina
-    gravatar: 48f5bbc2752b434e2b6d0ec263da193e
-    email: mark@rondina.net
-    web: http://www.markrondina.com/
-    twitter: mrondina
-    github: mrondina
-    bio: 'Interactive designer working in web, games and mobile development.'
-  jonlau:
-    display_name: Jonathan Lau
-    gravatar: 0bed1d08d62923272cb9786f375edcc8
-    email: jon@jon.sg
-    web: http://jon.sg
-    github: lauweijie
-    bio: 'Front-end developer.'
 
 resourceCategories: ["philosophy", "sources", "redesigns", "inspiration", "tutorials", "showcase"]
diff --git a/_data/authors.yml b/_data/authors.yml
new file mode 100644
index 0000000..c3608b0
--- /dev/null
+++ b/_data/authors.yml
@@ -0,0 +1,71 @@
+garthdb:
+  display_name: Garth Braithwaite
+  gravatar: b5cf6e112eeee572d722743dea924487
+  picture: http://gravatar.com/avatar/b5cf6e112eeee572d722743dea924487?s=200
+  email: garthdb@gmail.com
+  web: http://www.garthdb.com/
+  twitter: garthdb
+  github: garthdb
+  bio: 'Product Designer? and Front End Developer on <a href="http://phonegap.com">PhoneGap</a> at <a href="http://adobe.com">Adobe</a>. <a href="http://opendesign.foundation">The Open Design Foundation</a> Founder.'
+una:
+  display_name: Una Kravets
+  gravatar: 732b3562b0496389b40e548918c38f98
+  picture: http://gravatar.com/avatar/b5cf6e112eeee572d722743dea924487?s=200
+  email: una.kravets@gmail.com
+  web: http://unakravets.com/
+  twitter: una
+  github: una
+  bio: 'UI engineer <a href="http://do.co/welcome">DigitalOcean</a>. Community builder, technical writer, & cohost of <a href="http://toolsday.io">Toolsday</a>.'
+ttimsmith:
+  display_name: Tim Smith
+  gravatar: febbffcb54abe1be1435720fc2268237
+  picture: http://gravatar.com/avatar/febbffcb54abe1be1435720fc2268237?s=200
+  email: smith@ttimsmith.com
+  web: http://theboldreport.net
+  twitter: ttimsmith
+  github: ttimsmith
+  bio: 'Designer who codes, blabber mouth, and coffee addict.'
+areus:
+  display_name: Areus Wade
+  gravatar: 3a88629dd9417c822b68af4af685b782
+  picture: http://gravatar.com/avatar/3a88629dd9417c822b68af4af685b782?s=200
+  email: hi@areuswade.com
+  web: http://areuswade.com
+  twitter: areus
+  github: areus
+  bio: 'Designer in San Diego building <a href="http://areus.co/pctg">precomposed stuff</a>.'
+terracomma:
+  display_name: Christopher Moody
+  gravatar: 80d7c270dfac1d947d2b3fd39bf70b6a
+  picture: http://gravatar.com/avatar/80d7c270dfac1d947d2b3fd39bf70b6a?s=200
+  email: terracomma@gmail.com
+  web: http://moody.coffee/
+  twitter: terracomma
+  github: terracomma
+  bio: 'Designer & Developer. Product designer at IBM. Core Contributor <a href="http://opendesign.foundation/">The Open Design Foundation</a>. Licensed Intoxicologist.'
+vitorio:
+  display_name: Vitorio Miliano
+  gravatar: 1b2ea3fc983558c15216a609af35f709
+  picture: http://gravatar.com/avatar/1b2ea3fc983558c15216a609af35f709?s=200
+  email: email_re_designers_opensource@vitor.io
+  web: http://vitor.io
+  twitter: vitor_io
+  github: vitorio
+  bio: 'User experience and interaction designer. I like talking about genuine outbreaks of the future.'
+mrondina:
+  display_name: Mark Rondina
+  gravatar: 48f5bbc2752b434e2b6d0ec263da193e
+  picture: http://gravatar.com/avatar/48f5bbc2752b434e2b6d0ec263da193e?s=200
+  email: mark@rondina.net
+  web: http://www.markrondina.com/
+  twitter: mrondina
+  github: mrondina
+  bio: 'Interactive designer working in web, games and mobile development.'
+jonlau:
+  display_name: Jonathan Lau
+  gravatar: 0bed1d08d62923272cb9786f375edcc8
+  picture: http://gravatar.com/avatar/0bed1d08d62923272cb9786f375edcc8?s=200
+  email: jon@jon.sg
+  web: http://jon.sg
+  github: lauweijie
+  bio: 'Front-end developer.'
diff --git a/_drafts/moodboard-for-this-site.md b/_drafts/moodboard-for-this-site.md
index f51af5e..38d69b8 100644
--- a/_drafts/moodboard-for-this-site.md
+++ b/_drafts/moodboard-for-this-site.md
@@ -1,6 +1,5 @@
 ---
 title: "Moodboard for This Site"
 layout: post
-category: articles
 tags:
----
\ No newline at end of file
+---
diff --git a/_drafts/open-source-design-for-developers.md b/_drafts/open-source-design-for-developers.md
index a1fccc1..e9bfdb8 100644
--- a/_drafts/open-source-design-for-developers.md
+++ b/_drafts/open-source-design-for-developers.md
@@ -1,7 +1,6 @@
 ---
 title: "Open Source Design for Developers"
 layout: post
-category: articles
 tags:
 ---
 In addition to pushing designers toward open collaboration, I've also begun speaking at open source development conferences with 2 goals in mind:
diff --git a/_includes/author.html b/_includes/author.html
new file mode 100644
index 0000000..3a46c59
--- /dev/null
+++ b/_includes/author.html
@@ -0,0 +1,14 @@
+{% assign author = site.data.authors[page.author] %}
+<div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
+  <div clas="avatar">
+    <a href="{{author.web}}">
+      {% if avatar.width and avatar.height %}
+      <img itemprop="image" class= src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="{{ avatar.width }}" height="{{ avatar.height }}">
+      {% else %}
+      <img itemprop="image" class= src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30">
+      {% endif %}
+    </a>
+  </div>
+  <h3>About the author: <a href="{{author.web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
+  <p class="author_bio">{{author.bio}}</p>
+</div>
diff --git a/_includes/global-header.html b/_includes/global-header.html
new file mode 100644
index 0000000..c5240ed
--- /dev/null
+++ b/_includes/global-header.html
@@ -0,0 +1,6 @@
+<div id="globalheadplaceholder" class="globalheadplaceholder"></div>
+<div id="globalhead" class="globalhead">
+  <a href="/">
+      {% include logo.svg %}
+  </a>
+</div>
diff --git a/_includes/header.scss b/_includes/header.scss
new file mode 100644
index 0000000..6053ec3
--- /dev/null
+++ b/_includes/header.scss
@@ -0,0 +1 @@
+@import 'header';
diff --git a/_includes/post_footer.html b/_includes/post-footer-nav.html
similarity index 100%
rename from _includes/post_footer.html
rename to _includes/post-footer-nav.html
diff --git a/_includes/post-footer.html b/_includes/post-footer.html
new file mode 100644
index 0000000..d3e17f8
--- /dev/null
+++ b/_includes/post-footer.html
@@ -0,0 +1,5 @@
+<footer class="article-footer">
+  {% include author.html %}
+  {% include post-footer-nav.html %}
+  {% include comments.html %}
+</footer>
diff --git a/_layouts/default.html b/_layouts/default.html
index 3f3dff2..d6f0650 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,12 +2,7 @@
 layout: compress
 ---
 {% include head.html %}
-<div id="globalheadplaceholder" class="globalheadplaceholder"></div>
-<div id="globalhead" class="globalhead">
-  <a href="/">
-    {% include logo.svg %}
-  </a>
-</div>
+{% include global-header.html %}
 {{ content }}
 {% include global-footer.html %}
 {% include foot.html %}
diff --git a/_layouts/facebook-academy.html b/_layouts/facebook-academy.html
index c917b22..8736e71 100644
--- a/_layouts/facebook-academy.html
+++ b/_layouts/facebook-academy.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Open Source Design{% if page.title %} | {{ page.title }}{% endif %}</title>
+    <title>{% if page.title %}{{ page.title }} | {% endif %}The Open Design Foundation</title>
     <link rel="shortcut icon" href="/favicon.ico">
     <style>
       .guys{
@@ -37,37 +37,24 @@
     <![endif]-->
   </head>
   <body itemscope itemtype="http://schema.org/WebPage">
-      {% include head.html %}
-    <div id="globalheadplaceholder"></div>
-      <div id="globalhead">
-        <a href="/">
-            {% include logo.svg %}
-        </a>
-      </div>
-      <div id="content">
-        <article itemscope itemtype="http://schema.org/BlogPosting" class="post">
-            <meta itemprop="description" content="{{ page.excerpt | strip_html}}">
-            {% assign author = site.authors[page.author] %}
-            <div id="banner"><img src="/img/fboa_banner_v2.png" width="100%" height="auto" alt="Facebook Open Academy"/></div>
-        <header class="article-header">
-            <h1 itemprop="name">{{ page.title }}</h1>
-            <p>Published on <time itemprop="datePublished" datetime="{{page.date | date: "%Y-%m-%d" }}">{{page.date | date: "%b %e, %Y" }}</time></p>
-        </header>
-        <section itemprop="articleBody" class="article-body">
-            {{ content }}
-        </section>
-        <footer class="article-footer">
-            <div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
-            <a href="{{author.web}}"><img itemprop="image" src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30"></a>
-            <h3>About the author: <a href="{{site.authors[page.author].web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
-            <p class="author_bio">{{author.bio}}</p>
-            </div>
-            {% include post_footer.html %}
-            {% include comments.html %}
-        </footer>
-        <meta itemprop="url" content="{{ site.url }}{{ page.url }}">
-        </article>
-      </div>
+    {% include head.html %}
+    {% include global-header.html %}
+    <div id="content">
+      <article itemscope itemtype="http://schema.org/BlogPosting" class="post">
+          <meta itemprop="description" content="{{ page.excerpt | strip_html}}">
+          {% assign author = site.data.authors[page.author] %}
+          <div id="banner"><img src="/img/fboa_banner_v2.png" width="100%" height="auto" alt="Facebook Open Academy"/></div>
+      <header class="article-header">
+          <h1 itemprop="name">{{ page.title }}</h1>
+          <p>Published on <time itemprop="datePublished" datetime="{{page.date | date: "%Y-%m-%d" }}">{{page.date | date: "%b %e, %Y" }}</time></p>
+      </header>
+      <section itemprop="articleBody" class="article-body">
+          {{ content }}
+      </section>
+      {% include post-footer.html %}
+      <meta itemprop="url" content="{{ site.url }}{{ page.url }}">
+      </article>
+    </div>
   </body>
   {% include analytics.html %}
 </html>
diff --git a/_layouts/open-design-is-not-design-by-committee.html b/_layouts/open-design-is-not-design-by-committee.html
index 32187f1..c4f63db 100644
--- a/_layouts/open-design-is-not-design-by-committee.html
+++ b/_layouts/open-design-is-not-design-by-committee.html
@@ -7,14 +7,14 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Open Source Design{% if page.title %} | {{ page.title }}{% endif %}</title>
+  <title>{% if page.title %}{{ page.title }} | {% endif %}The Open Design Foundation</title>
   <link rel="shortcut icon" href="/favicon.ico">
   <style>
     @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,800);
-    #sitebar{background:#000;padding-top:5px;height:36px;text-align:center;-moz-box-sizing:border-box;box-sizing:border-box;position:fixed;width:100%;top:0;z-index:10;}
-    #sitebar a:hover{background:transparent;}
-    #sitebar a:hover path{fill:#f5f58f}
-    *{
+    {% capture include_to_scssify %}{% include header.scss %}{% endcapture %}
+    {{ include_to_scssify | scssify }}
+
+    * {
       border:0;
       outline:0;
       padding:0;
@@ -23,6 +23,15 @@
       font-family: "Open Sans", sans-serif;
     }
 
+    a {
+      text-decoration: none;
+      color: #924e1f;
+    }
+
+    a:hover {
+      text-decoration: underline;
+    }
+
     section{
       width:100%;
       max-width: 40rem;
@@ -31,23 +40,19 @@
       line-height: 180%;
     }
 
-    h2{
+    h2 {
       padding-top: 1rem;
     }
 
-    p{
+    p {
       padding-bottom:1rem;
     }
 
-    a{
-      color:#5000B4;
-    }
-
-    ol{
+    ol {
       margin-left:2rem;
     }
 
-    blockquote{
+    blockquote {
       font-size: 240%;
       font-style: italic;
       line-height: 130%;
@@ -59,7 +64,7 @@
        top: -0.4rem;
     }
 
-    sup a{
+    sup a {
       font-family: "Courier New", serif;
       text-decoration: none;
       font-weight: bold;
@@ -132,10 +137,7 @@
   <body itemscope itemtype="http://schema.org/WebPage">
     <meta itemscope itemprop="url" content="{{ site.url }}{{ page.url }}">
     {% if page.title %}<meta itemscope itemprop="name" content="{{ page.title }}">{% endif %}
-    <div id="sitebar"><a href="/">
-        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" x="0px" y="0px" width="25px" height="25px" viewBox="0 0 25 25" xml:space="preserve">
-          <path fill="#FFF" d="M12.5,10.521c-1.093,0-1.979,0.886-1.979,1.979c0,0.953,0.673,1.747,1.57,1.936V24.99C12.227,24.994,12.363,25,12.5,25 s0.273-0.006,0.409-0.01V14.436c0.896-0.189,1.57-0.984,1.57-1.936C14.479,11.407,13.593,10.521,12.5,10.521z M25,12.5 C25,5.596,19.403,0,12.5,0S0,5.596,0,12.5c0,6.489,4.944,11.821,11.271,12.439l0,0l0-0.002l0,0 c-0.031-5.08-3.094-9.005-4.364-10.415v0c0,0-0.522-0.626-0.226-1.376l2.314-5.869c0,0,0.428-1.085,1.379-1.085H12.5h2.127 c0.951,0,1.379,1.085,1.379,1.085l2.314,5.869c0.296,0.75-0.226,1.376-0.226,1.376v0c-1.271,1.411-4.333,5.335-4.364,10.415l0,0.002 C20.056,24.321,25,18.989,25,12.5z"></path>
-        </svg></a></div>
+    {% include global-header.html %}
     <div id="site">
       <div id="image">
         <svg xmlns="http://www.w3.org/2000/svg" width="216" height="216" viewBox="0 0 216 216" preserveAspectRatio="none">
@@ -150,17 +152,11 @@ <h1 itemprop="name">Open<br/>Design<br/>is not<br/>Design by<br/>Committee</h1>
         <section itemprop="articleBody">
           {{ content }}
         </section>
-        <div id="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
-          {% assign author = site.authors[page.author] %}
-          <header>About the author</header>
-          <section>
-            <div id="avatar"><a href="{{author.web}}"><img itemprop="image" src="http://www.gravatar.com/avatar/{{author.gravatar}}?s=160.jpg" alt="{{author.display_name}}" width="80" height="80"></a></div>
-            <h3><a href="{{author.web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
-            <p class="author_bio">{{author.bio}}</p>
-          </section>
-        </div>
-        {% include post_footer.html %}
-        {% include comments.html %}
+        <section>
+          {% include author.html %}
+          {% include post-footer-nav.html %}
+          {% include comments.html %}
+        </section>
       </article>
     </div>
     <footer></footer>
diff --git a/_layouts/post.html b/_layouts/post.html
index c473eb1..f5b4b51 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,7 +1,6 @@
 ---
 layout: default
 ---
-{% assign author = site.authors[page.author] %}
 <div id="content">
   <article itemscope itemtype="http://schema.org/BlogPosting" class="post">
     <meta itemprop="description" content="{{ page.excerpt | strip_html}}">
@@ -14,15 +13,7 @@ <h1 itemprop="name">{{ page.title }}</h1>
     <section itemprop="articleBody" class="article-body">
       {{ content }}
     </section>
-    <footer class="article-footer">
-      <div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
-        <a href="{{author.web}}"><img itemprop="image" src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30"></a>
-        <h3>About the author: <a href="{{site.authors[page.author].web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
-        <p class="author_bio">{{author.bio}}</p>
-      </div>
-      {% include post_footer.html %}
-      {% include comments.html %}
-    </footer>
+    {% include post-footer.html %}
     <meta itemprop="url" content="{{ site.url }}{{ page.url }}">
   </article>
 </div>
diff --git a/_layouts/resource.html b/_layouts/resource.html
index bc67dd1..8b5fc47 100644
--- a/_layouts/resource.html
+++ b/_layouts/resource.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-{% assign author = site.authors[page.author] %}
+{% assign author = site.data.authors[page.author] %}
 <div id="content">
   <article role="article" class="resource">
   	<header class="article-header">
@@ -18,4 +18,4 @@ <h1 itemprop="name">{{ page.title }}</h1>
   </article>
 </div>
 <br>
-<footer class="resource-comments">{% include comments.html %}</footer>
\ No newline at end of file
+<footer class="resource-comments">{% include comments.html %}</footer>
diff --git a/_layouts/using-github-for-design-collaboration.html b/_layouts/using-github-for-design-collaboration.html
index cc7f1ef..39a389b 100644
--- a/_layouts/using-github-for-design-collaboration.html
+++ b/_layouts/using-github-for-design-collaboration.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Open Source Design{% if page.title %} | {{ page.title }}{% endif %}</title>
+    <title>{% if page.title %}{{ page.title }} | {% endif %}The Open Design Foundation</title>
     <link rel="shortcut icon" href="/favicon.ico">
     <style>
       #sitebar{background:#000;padding-top:5px;height:36px;text-align:center;-moz-box-sizing:border-box;box-sizing:border-box;position:fixed;width:100%;top:0;z-index:10;}
@@ -26,8 +26,8 @@
 #author section{-moz-box-sizing:border-box;border-box:box-sizing;padding:0 0 0 95px;position:relative}
 #author h3{margin:15px 0 2px 0}
 #author p{margin-top:0}
-#avatar{position:absolute;left:0;top:0;}
-#avatar a:hover{background:transparent;}
+#avatar {position:absolute;left:0;top:0;}
+#avatar a:hover {background:transparent;}
 #avatar a:hover img{box-shadow:0 0 0 5px #f5f58f}
 #avatar img{border-radius:40px;box-shadow:0 0 0 5px #fff}
 @media screen and (max-width: 700px){#image{width:100%;height:0;padding-bottom:62%;position:relative;}
@@ -78,7 +78,7 @@ <h1 itemprop="name">Using GitHub for Design Collaboration</h1>
           {{ content }}
         </section>
         <div id="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
-          {% assign author = site.authors[page.author] %}
+          {% assign author = site.data.authors[page.author] %}
           <header>About the author</header>
           <section>
             <div id="avatar"><a href="{{author.web}}"><img itemprop="image" src="http://www.gravatar.com/avatar/{{author.gravatar}}?s=160.jpg" alt="{{author.display_name}}" width="80" height="80"></a></div>
@@ -86,7 +86,7 @@ <h3><a href="{{author.web}}" itemprop="url"><span itemprop="name">{{author.displ
             <p class="author_bio">{{author.bio}}</p>
           </section>
         </div>
-        {% include post_footer.html %}
+        {% include post-footer-nav.html %}
         {% include comments.html %}
       </article>
     </div>
diff --git a/_page.txt b/_templates/page.txt
similarity index 100%
rename from _page.txt
rename to _templates/page.txt
diff --git a/_post.txt b/_templates/post.txt
similarity index 78%
rename from _post.txt
rename to _templates/post.txt
index d2b8ad4..8a42f29 100644
--- a/_post.txt
+++ b/_templates/post.txt
@@ -1,7 +1,6 @@
 ---
 title:
 layout: post
-category: articles
 author:
 editor:
 priority:
diff --git a/_resource.txt b/_templates/resource.txt
similarity index 100%
rename from _resource.txt
rename to _templates/resource.txt
diff --git a/articles/_posts/2013-09-16-building_this_site.md b/articles/_posts/2013-09-16-building_this_site.md
index 7f6953c..cdd238d 100644
--- a/articles/_posts/2013-09-16-building_this_site.md
+++ b/articles/_posts/2013-09-16-building_this_site.md
@@ -1,7 +1,9 @@
 ---
 layout: post
 title: Building this Site
-tags: design design update
+tags:
+  - design
+  - update
 author: garthdb
 priority: 0.9
 excerpt: The catalyst for this site was a number of conversations I've had with some smart designers and developers and my personal interest in Free and Open Source software (F/OSS). I think the design community could benefit from the lessons learned by F/OSS development.
diff --git a/articles/_posts/2013-09-25-the-open-source-design-manifesto.md b/articles/_posts/2013-09-25-the-open-source-design-manifesto.md
index 983fb09..37c2e35 100644
--- a/articles/_posts/2013-09-25-the-open-source-design-manifesto.md
+++ b/articles/_posts/2013-09-25-the-open-source-design-manifesto.md
@@ -1,8 +1,6 @@
 ---
 title: "The Open Source Design Manifesto"
 layout: post
-category: articles
-tags:
 author: garthdb
 priority: 1.0
 excerpt: Using the term Open Source Design gets interesting reactions from different people. I want to clarify a little of what I think it means. It isn't about working for free, doing design by committee, or dealing with trolls (although I can't promise those things won't happen).  It is about challenging ourselves, our design process, and the way we work together in the design community.
diff --git a/articles/_posts/2013-10-01-designing-a-brand-in-the-open.md b/articles/_posts/2013-10-01-designing-a-brand-in-the-open.md
index f1a2768..423c2a2 100644
--- a/articles/_posts/2013-10-01-designing-a-brand-in-the-open.md
+++ b/articles/_posts/2013-10-01-designing-a-brand-in-the-open.md
@@ -1,8 +1,6 @@
 ---
 title: Designing a Brand in the Open
 layout: post
-category: articles
-tags:
 author: garthdb
 priority: 0.6
 excerpt: We have already started some open design discussion for this site in GitHub Issues (IA and UI).  This discussion will lead to some loose design prototypes in a new repo that the community can fork and contribute to, but for the project branding we've decided to try LayerVault and Creative Cloud. You do not need to sign up for an account on Creative Cloud to comment there.
diff --git a/articles/_posts/2013-10-09-using-github-for-design-collaboration.md b/articles/_posts/2013-10-09-using-github-for-design-collaboration.md
index 0a492b7..4486fc5 100644
--- a/articles/_posts/2013-10-09-using-github-for-design-collaboration.md
+++ b/articles/_posts/2013-10-09-using-github-for-design-collaboration.md
@@ -1,8 +1,9 @@
 ---
 title: "Using GitHub for Design Collaboration"
 layout: using-github-for-design-collaboration
-category: articles
-tags: GitHub collaboration
+tags:
+  - GitHub
+  - collaboration
 author: ttimsmith
 date: '2013-10-09 13:39:07'
 excerpt: GitHub ends up being a great tool for design collaboration.
@@ -11,7 +12,7 @@ I haven't been giving GitHub enough credit. The power of collaboration, even for
 
 I've worked on a couple of design teams. Many of them weren't really collaborative. It's not their fault. The fact is, that Photoshop and Fireworks[^1] files don't lend themselves for collaboration. And to be honest, most of us Designers hate it when you touch our files.[^2]
 
-However, with Open Source Design, we're tossing these old ways to the side and trying something new, and that's where GitHub issues come into play.
+However, with The Open Design Foundation, we're tossing these old ways to the side and trying something new, and that's where GitHub issues come into play.
 
 ## Ideas Snowball
 
diff --git a/articles/_posts/2013-10-31-open-design-is-not-design-by-committee.md b/articles/_posts/2013-10-31-open-design-is-not-design-by-committee.md
index ed1005c..56bba0d 100644
--- a/articles/_posts/2013-10-31-open-design-is-not-design-by-committee.md
+++ b/articles/_posts/2013-10-31-open-design-is-not-design-by-committee.md
@@ -1,7 +1,6 @@
 ---
 title: "Open Design is not Design by Committee"
 layout: open-design-is-not-design-by-committee
-category: articles
 tags: faq
 author: garthdb
 priority: 0.9
@@ -14,15 +13,15 @@ For those who are unfamiliar with the term Design By Committee, it is a special
 
 ## Misunderstanding of the Term Open Source
 
-I think some designers have the mistaken idea that open source projects are lawless anarchies, where random contributors haphazardly throw bits and pieces together; forming a version of Frankenstein's monster that hopefully can perform basic tasks. In reality a healthy open source project needs to have an owner, or small group of owners[^1], with a strong sense of where the project is heading. With a core team in place, outside contributors can file issues, submit contributions, and just complain about things they don't like. The core team of owners can then accept or reject the contributions from the community (hopefully in a way that encourages growth and future contributions).
+I think some designers have the mistaken idea that open source projects are lawless anarchies, where random contributors haphazardly throw bits and pieces together; forming a version of Frankenstein's monster that hopefully can perform basic tasks. In reality a healthy open source project needs to have an owner, or small group of owners[^footnote], with a strong sense of where the project is heading. With a core team in place, outside contributors can file issues, submit contributions, and just complain about things they don't like. The core team of owners can then accept or reject the contributions from the community (hopefully in a way that encourages growth and future contributions).
 
 > Instead of being an expert consultant, the designer becomes the tool of the committee members who often have very little design experience
 
 ## Ownership is key
 
-The most important difference between Open Source Design and Design by Committee is this concept of ownership. In the context of Design by Committee, usually the designer is a contractor or agency hired by the committee, or underling that is far below the committee members on the org chart. This is the heart of the problem with designing by committee; instead of being an expert consultant, the designer becomes the tool of the committee members who often have very little design experience. It is not unlike giving a formula one racecar to someone without a driver's license; regardless of how well the car can perform, the result will most likely be unremarkable or even disastrous.
+The most important difference between The Open Design Foundation and Design by Committee is this concept of ownership. In the context of Design by Committee, usually the designer is a contractor or agency hired by the committee, or underling that is far below the committee members on the org chart. This is the heart of the problem with designing by committee; instead of being an expert consultant, the designer becomes the tool of the committee members who often have very little design experience. It is not unlike giving a formula one racecar to someone without a driver's license; regardless of how well the car can perform, the result will most likely be unremarkable or even disastrous.
 
-In the case of Open Source Design, not all contributors and community members are equal, but all involved should be designers. The owner of the project is the lead designer the majority of the time, and when contributions come in, switches to role of creative director. They should help to shape contributions to fit into the overall purpose of the project, or reject them outright with clear reasoning.
+In the case of The Open Design Foundation, not all contributors and community members are equal, but all involved should be designers. The owner of the project is the lead designer the majority of the time, and when contributions come in, switches to role of creative director. They should help to shape contributions to fit into the overall purpose of the project, or reject them outright with clear reasoning.
 
 ## That Sounds Like a Lot of Work
 
@@ -38,4 +37,4 @@ It can happen. As ideas collide in a discussion, it is possible that contributor
 
 When implemented correctly, the Open Source workflow benefits all parties involved. Contributors get a chance to collaborate with designers in a more autonomous capacity than most work environments allow, and still receive feedback and encouragement from the project owners. The owners get outside opinions to challenge their assumptions and sometimes they get fantastic contributions worth all the hassle. Most importantly, all the designers involved have the privilege of improving the design community and building something they care about.
 
-[^1]:Eric S. Raymond has an [excellent article](http://catb.org/esr/writings/homesteading/homesteading/ar01s04.html) on the subject of Open Source Ownership.
+[^footnote]: Eric S. Raymond has an [excellent article](http://catb.org/esr/writings/homesteading/homesteading/ar01s04.html) on the subject of Open Source Ownership.
diff --git a/articles/_posts/2013-11-2-how-to-contribute.md b/articles/_posts/2013-11-2-how-to-contribute.md
index 09bc64f..fdf59e1 100644
--- a/articles/_posts/2013-11-2-how-to-contribute.md
+++ b/articles/_posts/2013-11-2-how-to-contribute.md
@@ -1,8 +1,9 @@
 ---
 title: "How To Contribute to a Jekyll Blog on Github"
 layout: post
-category: articles
-tags: GitHub collaboration
+tags:
+  - GitHub
+  - collaboration
 author: areus
 date: '2013-11-2 02:10:02'
 excerpt: Step by step instructions for contributing to a Jekyll Blog.
diff --git a/articles/_posts/2013-12-06-the-roadmap.md b/articles/_posts/2013-12-06-the-roadmap.md
index c1d270f..f69c7c6 100644
--- a/articles/_posts/2013-12-06-the-roadmap.md
+++ b/articles/_posts/2013-12-06-the-roadmap.md
@@ -1,8 +1,9 @@
 ---
 title: "The Roadmap"
 layout: post
-category: articles
-tags: design design update
+tags:
+  - design
+  - update
 author: garthdb
 date: '2013-12-06 10:15:00'
 excerpt: Someone in the IRC asked how they could contribute and what our roadmap is.  I thought I would lay out a few places where anyone could jump in if they wanted to help out.
@@ -56,7 +57,7 @@ If you need a place to start we have a running list of topics in the [github iss
 
 ## Designers Wanted
 
-This is a site about open source design, and has a definite lack of design going on here.  The easiest way to jump in is to comment in the [design discussions](https://github.com/designopen/designopen.github.io/issues?direction=desc&labels=design+discussion&page=1&sort=updated&state=open):
+This is a site about open design, and has a definite lack of design going on here.  The easiest way to jump in is to comment in the [design discussions](https://github.com/designopen/designopen.github.io/issues?direction=desc&labels=design+discussion&page=1&sort=updated&state=open):
 
 <ul id="design-discussions"></ul>
 
@@ -70,6 +71,6 @@ The idea is each post should be unique, so there is no style guide to follow; ma
 
 ## Resource Seekers Wanted
 
-Sorry, resource seeker sounds lame, but I couldn't think of a more elegant want to put it.  We have a running list of resources and examples of open source design.  Feel free to tweet [@designopen](http://www.twitter.com/designopen) if you have anything you'd like to add.
+Sorry, resource seeker sounds lame, but I couldn't think of a more elegant want to put it.  We have a running list of resources and examples of open design.  Feel free to tweet [@designopen](http://www.twitter.com/designopen) if you have anything you'd like to add.
 
 [^1]: Our IRC channel is #opensourcedesign on Freenode
diff --git a/articles/_posts/2014-01-17-designers-can-open-source-session-video.md b/articles/_posts/2014-01-17-designers-can-open-source-session-video.md
index ca78b73..eaed2ae 100644
--- a/articles/_posts/2014-01-17-designers-can-open-source-session-video.md
+++ b/articles/_posts/2014-01-17-designers-can-open-source-session-video.md
@@ -1,10 +1,12 @@
 ---
 title: "Designers Can Open Source Session Video"
 layout: post
-category: articles
 author: garthdb
 date: '2014-01-17 06:15:00'
-tags: video, conference, session
+tags:
+  - video
+  - conference
+  - session
 excerpt: A session given on open source design given at Blend Conf 2013.
 ---
 
diff --git a/articles/_posts/2014-03-31-whats-next.md b/articles/_posts/2014-03-31-whats-next.md
index b08b531..a40dae1 100644
--- a/articles/_posts/2014-03-31-whats-next.md
+++ b/articles/_posts/2014-03-31-whats-next.md
@@ -1,7 +1,6 @@
 ---
 title: "Open Source for Self Improvement"
 layout: post
-category: articles
 tags: improvement
 author: garthdb
 date: '2014-03-31 10:16:00'
diff --git a/articles/_posts/2014-04-07-being-stylish.md b/articles/_posts/2014-04-07-being-stylish.md
index 1195049..0658eb7 100644
--- a/articles/_posts/2014-04-07-being-stylish.md
+++ b/articles/_posts/2014-04-07-being-stylish.md
@@ -1,7 +1,6 @@
 ---
 title: "Styling Open Source"
 layout: post
-category: articles
 tags: improvement
 author: terracomma
 date: '2014-04-07 10:16:00'
diff --git a/articles/_posts/2014-05-27-import-designers.md b/articles/_posts/2014-05-27-import-designers.md
index 2efca13..4436052 100644
--- a/articles/_posts/2014-05-27-import-designers.md
+++ b/articles/_posts/2014-05-27-import-designers.md
@@ -1,8 +1,10 @@
 ---
 title: "How to get designers (or anyone) to work on your open source project"
 layout: post
-category: articles
-tags: news featured improvement
+tags:
+  - news
+  - featured
+  - improvement
 author: vitorio
 date: '2014-05-27 21:33:00'
 excerpt: Vitorio gives a breakdown of how open source project maintainers can attract and work with designers, or any non developers.
diff --git a/articles/_posts/2014-09-15-hitting-the-road.md b/articles/_posts/2014-09-15-hitting-the-road.md
index ecf5d02..9014fc6 100644
--- a/articles/_posts/2014-09-15-hitting-the-road.md
+++ b/articles/_posts/2014-09-15-hitting-the-road.md
@@ -4,7 +4,7 @@ layout: post
 author: garthdb
 priority: 0.9
 tags: featured
-excerpt: Open Source Design is coming to a conference near you; maybe.
+excerpt: The Open Design Foundation is coming to a conference near you; maybe.
 ---
 The ultimate goal of this project is to get more designers and developers collaborating together in the open, to that end I'm speaking at a few conferences to help designers and/or developers do just that.
 
diff --git a/articles/_posts/2014-09-29-open-source-design-is-now-design-open.md b/articles/_posts/2014-09-29-open-source-design-is-now-design-open.md
index 88c6214..b3142e1 100644
--- a/articles/_posts/2014-09-29-open-source-design-is-now-design-open.md
+++ b/articles/_posts/2014-09-29-open-source-design-is-now-design-open.md
@@ -1,15 +1,16 @@
 ---
-title: "Open Source Design is now Design Open"
+title: "Open Source Design is now The Open Design Foundation"
 layout: post
 author: garthdb
 editor: mrondina
 priority: 0.9
-excerpt: Open Source Design has been renamed to Design Open, let's talk about why.
-tags: annoucement featured news
+excerpt: Open Source Design has been renamed to The Open Design Foundation, let's talk about why.
+tags:
+  - announcement
+  - featured
+  - news
 ---
-**Update:** Design Open has been renamed again to the Open Design Foundation.
-
-Thanks to some timely posts to our [GitHub issue on branding](https://github.com/DesignOpen/designopen.github.io/issues/33#issuecomment-56763448) we decided to rethink the name of this project. Originally I planned for the site to be a definitive guide on what open source design is, hence the original domain name, opensourcedesign.is, but that has become too limiting for the direction this project is heading. Instead we are moving to a call for action: *Design Open!*
+Thanks to some timely posts to our [GitHub issue on branding](https://github.com/DesignOpen/designopen.github.io/issues/33#issuecomment-56763448) we decided to rethink the name of this project. Originally I planned for the site to be a definitive guide on what open source design is, hence the original domain name, opensourcedesign.is, but that has become too limiting for the direction this project is heading.
 
 ## The Difference between Open Design and Open Source Design
 
@@ -23,4 +24,4 @@ The removal of the term open source from the name of this project does not signi
 
 ## The Call
 
-A while ago this site hit the front page of [Designer News](https://www.designernews.co/stories/8313-open-source-design-using-layervault) and the traffic spiked dramatically. It was wonderful to get the exposure, but ultimately I found it a little disappointing that it didn't lead to any significant, trackable increase in discussion. This is not merely a nice idea, it is a clarion call to shed our insecurities, pride, and paralyzing perfectionism; to dedicate effort to helping worthy causes; and to raise the quality of design and design education on the web. A call to design open.
+A while ago this site hit the front page of [Designer News](https://www.designernews.co/stories/8313-open-source-design-using-layervault) and the traffic spiked dramatically. It was wonderful to get the exposure, but ultimately I found it a little disappointing that it didn't lead to any significant, trackable increase in discussion. This is not merely a nice idea, it is a clarion call to shed our insecurities, pride, and paralyzing perfectionism; to dedicate effort to helping worthy causes; and to raise the quality of design and design education on the web. A call to be open in our design practices.
diff --git a/articles/_posts/2014-10-24-facebook-open-academy.md b/articles/_posts/2014-10-24-facebook-open-academy.md
index 1d51fe0..b0f1b9e 100644
--- a/articles/_posts/2014-10-24-facebook-open-academy.md
+++ b/articles/_posts/2014-10-24-facebook-open-academy.md
@@ -1,7 +1,6 @@
 ---
 title: "Facebook Open Academy"
 layout: facebook-academy
-category: articles
 author: garthdb
 priority: 0.9
 tags: featured
diff --git a/articles/_posts/2014-11-04-open-kitchen.md b/articles/_posts/2014-11-04-open-kitchen.md
index 7ea2143..fa3ebd1 100644
--- a/articles/_posts/2014-11-04-open-kitchen.md
+++ b/articles/_posts/2014-11-04-open-kitchen.md
@@ -1,7 +1,6 @@
 ---
 title: "My Favorite Restaurant"
 layout: post
-category: articles
 author: terracomma
 priority: 0.9
 tags: featured
diff --git a/articles/_posts/2014-11-11-barriers-for-designers.md b/articles/_posts/2014-11-11-barriers-for-designers.md
index 5c789e0..cc3cb81 100644
--- a/articles/_posts/2014-11-11-barriers-for-designers.md
+++ b/articles/_posts/2014-11-11-barriers-for-designers.md
@@ -1,9 +1,7 @@
 ---
 title: "The Intimidation Barrier"
 layout: post
-category: articles
 author: una
-tags:
 excerpt: At SassConf this year, there was a lot of talk about why designers don't contribute to open source, and how we can start to influence change.
 ---
 
diff --git a/articles/_posts/2015-02-25-open-study.md b/articles/_posts/2015-02-25-open-study.md
index eba9b41..4dee164 100644
--- a/articles/_posts/2015-02-25-open-study.md
+++ b/articles/_posts/2015-02-25-open-study.md
@@ -1,10 +1,12 @@
 ---
 title: "Open Study: A Call for Help"
 layout: post
-category: articles
 author: garthdb
 priority: 1
-tags: ux study featured
+tags:
+  - ux
+  - study
+  - featured
 excerpt: An attempt to obtain more data about how designers can and do work on open source projects.
 ---
 ## MOAR DATA!
diff --git a/articles/_posts/2015-03-03-resource-collector.md b/articles/_posts/2015-03-03-resource-collector.md
index b16a1fe..2ed4701 100644
--- a/articles/_posts/2015-03-03-resource-collector.md
+++ b/articles/_posts/2015-03-03-resource-collector.md
@@ -1,7 +1,6 @@
 ---
 title: "Introducing Our New Resource Collector"
 layout: post
-category: articles
 author: jonlau
 editor: mrondina
 priority: 1
diff --git a/articles/index.html b/articles/index.html
index 72edd5b..7e616dd 100644
--- a/articles/index.html
+++ b/articles/index.html
@@ -1,10 +1,11 @@
 ---
 layout: page
 title: Articles
+permalink: articles/
 ---
 <ul class="bloglist">
   {% for post in site.categories.articles %}
-    {% assign author = site.authors[post.author] %}
+    {% assign author = site.data.authors[post.author] %}
     <li class="post" itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
       <h3 class="title" itemscope itemprop="name"><a href="{{ post.url }}" itemprop="url">{{ post.title }}</a></h3>
       <div class="meta">
diff --git a/at/oscon/index.md b/at/oscon/index.md
deleted file mode 100644
index 848d262..0000000
--- a/at/oscon/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: post
-title: OSCON 2014
-tags: design, design update
-author: garthdb
----
-
-[Garth](http://www.twitter.com/garthdb) will be speaking about Open Source Design at OSCON on July 23rd in Portland.
diff --git a/atom.xml b/atom.xml
index d21516d..5ba6757 100644
--- a/atom.xml
+++ b/atom.xml
@@ -9,7 +9,7 @@
   <link type="application/atom+xml" rel="self" href="{{site.url}}/atom.xml"/>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
   <id>{{site.url}}/</id>
-  {% for author in site.authors %}
+  {% for author in site.data.authors %}
   <author>
     <name>{{author[1].display_name}}</name>
     <uri>{{author[1].web}}</uri>
@@ -24,11 +24,10 @@
     <published>{{ post.date | date_to_xmlschema }}</published>
     <updated>{{ post.date | date_to_xmlschema }}</updated>
     <author>
-      <name>{{ site.authors[post.author].display_name }}</name>
-      <uri>{{ site.authors[post.author].web }}</uri>
+      <name>{{ site.data.authors[post.author].display_name }}</name>
+      <uri>{{ site.data.authors[post.author].web }}</uri>
     </author>
     <content type="html">{{ post.content | xml_escape }}</content>
   </entry>
   {% endfor %}
-
 </feed>
diff --git a/categories.json b/categories.json
deleted file mode 100644
index 1a3929b..0000000
--- a/categories.json
+++ /dev/null
@@ -1,3 +0,0 @@
----
----
-{"categories":[{% for categ in site.resourceCategories %}"{{ categ }}"{% if forloop.last == false %},{% endif %}{% endfor %}]}
\ No newline at end of file
diff --git a/index.html b/index.html
index 02ee5b5..bf5d771 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,7 @@
 ---
 layout: home
 title: Home
+permalink: /
 ---
 <div id="content" class="site" >
   <section class="home-section">
@@ -16,7 +17,7 @@ <h2 class="title" itemprop="name">Recent Articles</h2>
     {% for post in site.categories.articles %}
     {% if post.tags contains 'featured' and counter < 3 %}
     {% assign counter=counter | plus:1 %}
-    {% assign author = site.authors[post.author] %}
+    {% assign author = site.data.authors[post.author] %}
       <li class="post" itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
         <h3 class="title"><a href="{{ post.url }}" itemprop="url"><span itemprop="name">{{ post.title }}</span></a></h3>
         <div class="meta">
diff --git a/categories.js b/js/categories.js
similarity index 79%
rename from categories.js
rename to js/categories.js
index 417de62..ac28d99 100644
--- a/categories.js
+++ b/js/categories.js
@@ -1,5 +1,5 @@
 ---
-url: "/categories.js"
+permalink: /categories.js
 ---
 functionCall(
 [{% for categ in site.resourceCategories %}
diff --git a/js/categories.json b/js/categories.json
new file mode 100644
index 0000000..db7d850
--- /dev/null
+++ b/js/categories.json
@@ -0,0 +1,4 @@
+---
+permalink: /categories.json
+---
+{"categories":[{% for categ in site.resourceCategories %}"{{ categ }}"{% if forloop.last == false %},{% endif %}{% endfor %}]}
diff --git a/news.html b/news.html
deleted file mode 100644
index ab4957b..0000000
--- a/news.html
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: home
-title: Home
----
-
-<section class="home-section" itemscope itemtype="http://schema.org/ItemList">
-  <h2 class="title" itemprop="name">Resources</h2>
-  <meta itemscope itemprop="itemListOrder" content="Unordered" />
-    <ul class="reslist">
-    {% for post in site.categories.resourced %}
-      <li itemprop="itemListElement"><a href="{{ post.url }}">{{ post.title }}</a></li>
-    {% endfor %}
-    </ul>
-</section>
\ No newline at end of file
diff --git a/resources/index.html b/resources/index.html
index 0ba568b..7663e10 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -1,14 +1,15 @@
 ---
 layout: page
 title: Resources
+permalink: /resources/index.html
 ---
 {% for categ in site.resourceCategories %}
   <meta itemscope itemprop="itemListOrder" content="Unordered" />
   <h4>{{ categ }}</h4>
   <ul class="reslist" itemscope itemtype="http://schema.org/ItemList">
     {% for post in site.categories.resources %}
-      {% if post.category == categ %}
-        <li itemprop="itemListElement"><a href="{{ post.url }}">{{ post.title }}</a></li>
+      {% if post.category contains categ %}
+        <li itemprop="itemListElement"><a href="{{ post.url }}">{{ post.title }}</a></li>{{ post.category }}
       {% endif %}
     {% endfor %}
   </ul>