diff --git a/content/pages/2015-05-01---about/1.jpg b/content/pages/about/1.jpg
similarity index 100%
rename from content/pages/2015-05-01---about/1.jpg
rename to content/pages/about/1.jpg
diff --git a/content/pages/2015-05-01---about/index.md b/content/pages/about/index.md
similarity index 97%
rename from content/pages/2015-05-01---about/index.md
rename to content/pages/about/index.md
index e65c035..fbf0a1e 100644
--- a/content/pages/2015-05-01---about/index.md
+++ b/content/pages/about/index.md
@@ -1,7 +1,7 @@
 ---
 title: "About me"
-layout: page
-path: "/about"
+slug: "/about"
+template: "page"
 ---
 
 Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante.
diff --git a/content/pages/2015-05-01---contact/1.jpg b/content/pages/contact/1.jpg
similarity index 100%
rename from content/pages/2015-05-01---contact/1.jpg
rename to content/pages/contact/1.jpg
diff --git a/content/pages/2015-05-01---contact/index.md b/content/pages/contact/index.md
similarity index 98%
rename from content/pages/2015-05-01---contact/index.md
rename to content/pages/contact/index.md
index 3bc128e..b08e6db 100644
--- a/content/pages/2015-05-01---contact/index.md
+++ b/content/pages/contact/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Contact me"
-layout: page
-path: "/contact"
+slug: "/contact"
+template: "page"
 ---
 
 Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.
diff --git a/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md b/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md
index e031cfb..791b4aa 100644
--- a/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md
+++ b/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md
@@ -1,9 +1,9 @@
 ---
 title: Perfecting the Art of Perfection
 date: "2016-09-01T23:46:37.121Z"
-layout: post
+template: "post"
 draft: false
-path: "/posts/perfecting-the-art-of-perfection/"
+slug: "/posts/perfecting-the-art-of-perfection/"
 category: "Design Inspiration"
 tags:
   - "Handwriting"
diff --git a/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md
index 2077b98..d8abe10 100644
--- a/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md
+++ b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md
@@ -1,9 +1,9 @@
 ---
 title: The Origins of Social Stationery Lettering
 date: "2016-12-01T22:40:32.169Z"
-layout: post
+template: "post"
 draft: false
-path: "/posts/the-origins-of-social-stationery-lettering"
+slug: "/posts/the-origins-of-social-stationery-lettering"
 category: "Design Culture"
 tags:
   - "Typefaces"
diff --git a/content/posts/2016-02-02---A-Brief-History-of-Typography/index.md b/content/posts/2016-02-02---A-Brief-History-of-Typography/index.md
index a064e51..0233f5a 100644
--- a/content/posts/2016-02-02---A-Brief-History-of-Typography/index.md
+++ b/content/posts/2016-02-02---A-Brief-History-of-Typography/index.md
@@ -1,9 +1,9 @@
 ---
 title: "A Brief History of Typography"
 date: "2016-02-02T22:40:32.169Z"
-layout: post
+template: "post"
 draft: false
-path: "/posts/a-brief-history-of-typography/"
+slug: "/posts/a-brief-history-of-typography/"
 category: "Design Inspiration"
 tags:
   - "Linotype"
diff --git a/content/posts/2017-18-08---The-Birth-of-Movable-Type/index.md b/content/posts/2017-18-08---The-Birth-of-Movable-Type/index.md
index 3bde860..58889a5 100644
--- a/content/posts/2017-18-08---The-Birth-of-Movable-Type/index.md
+++ b/content/posts/2017-18-08---The-Birth-of-Movable-Type/index.md
@@ -1,9 +1,9 @@
 ---
 title: "Johannes Gutenberg: The Birth of Movable Type"
 date: "2017-08-18T22:12:03.284Z"
-layout: post
+template: "post"
 draft: false
-path: "/posts/the-birth-of-movable-type/"
+slug: "/posts/the-birth-of-movable-type/"
 category: "Typography"
 tags:
   - "Open source"
diff --git a/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/index.md b/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/index.md
index 73adf5e..4576c84 100644
--- a/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/index.md
+++ b/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/index.md
@@ -1,9 +1,9 @@
 ---
 title: Humane Typography in the Digital Age
 date: "2017-08-19T22:40:32.169Z"
-layout: post
+template: "post"
 draft: false
-path: "/posts/humane-typography-in-the-digital-age/"
+slug: "/posts/humane-typography-in-the-digital-age/"
 category: "Typography"
 tags:
   - "Design"
diff --git a/gatsby/create-pages.js b/gatsby/create-pages.js
index c9d24a6..551c38a 100644
--- a/gatsby/create-pages.js
+++ b/gatsby/create-pages.js
@@ -36,7 +36,7 @@ const createPages = async ({ graphql, actions }) => {
         edges {
           node {
             frontmatter {
-              layout
+              template
             }
             fields {
               slug
@@ -50,13 +50,13 @@ const createPages = async ({ graphql, actions }) => {
   const { edges } = result.data.allMarkdownRemark;
 
   _.each(edges, (edge) => {
-    if (_.get(edge, 'node.frontmatter.layout') === 'page') {
+    if (_.get(edge, 'node.frontmatter.template') === 'page') {
       createPage({
         path: edge.node.fields.slug,
         component: path.resolve('./src/templates/page-template.js'),
         context: { slug: edge.node.fields.slug }
       });
-    } else if (_.get(edge, 'node.frontmatter.layout') === 'post') {
+    } else if (_.get(edge, 'node.frontmatter.template') === 'post') {
       createPage({
         path: edge.node.fields.slug,
         component: path.resolve('./src/templates/post-template.js'),
diff --git a/gatsby/on-create-node.js b/gatsby/on-create-node.js
index 9686ea1..895bcde 100644
--- a/gatsby/on-create-node.js
+++ b/gatsby/on-create-node.js
@@ -14,7 +14,7 @@ const onCreateNode = ({ node, actions, getNode }) => {
       createNodeField({
         node,
         name: 'slug',
-        value: node.frontmatter.path
+        value: node.frontmatter.slug
       });
     } else {
       const value = createFilePath({ node, getNode });
diff --git a/gatsby/pagination/create-categories-pages.js b/gatsby/pagination/create-categories-pages.js
index 4114324..11007d7 100644
--- a/gatsby/pagination/create-categories-pages.js
+++ b/gatsby/pagination/create-categories-pages.js
@@ -11,7 +11,7 @@ module.exports = async (graphql, actions) => {
   const result = await graphql(`
     {
       allMarkdownRemark(
-        filter: { frontmatter: { layout: { eq: "post" }, draft: { ne: true } } }
+        filter: { frontmatter: { template: { eq: "post" }, draft: { ne: true } } }
       ) {
         group(field: frontmatter___category) {
           fieldValue
diff --git a/gatsby/pagination/create-posts-pages.js b/gatsby/pagination/create-posts-pages.js
index 792bcde..4be3351 100644
--- a/gatsby/pagination/create-posts-pages.js
+++ b/gatsby/pagination/create-posts-pages.js
@@ -9,7 +9,7 @@ module.exports = async (graphql, actions) => {
   const result = await graphql(`
     {
       allMarkdownRemark(
-        filter: { frontmatter: { layout: { eq: "post" }, draft: { ne: true } } }
+        filter: { frontmatter: { template: { eq: "post" }, draft: { ne: true } } }
       ) { totalCount }
     }
   `);
diff --git a/gatsby/pagination/create-tags-pages.js b/gatsby/pagination/create-tags-pages.js
index a2683d0..1e6df0d 100644
--- a/gatsby/pagination/create-tags-pages.js
+++ b/gatsby/pagination/create-tags-pages.js
@@ -11,7 +11,7 @@ module.exports = async (graphql, actions) => {
   const result = await graphql(`
     {
       allMarkdownRemark(
-        filter: { frontmatter: { layout: { eq: "post" }, draft: { ne: true } } }
+        filter: { frontmatter: { template: { eq: "post" }, draft: { ne: true } } }
       ) {
         group(field: frontmatter___tags) {
           fieldValue
diff --git a/src/templates/categories-list-template.js b/src/templates/categories-list-template.js
index f9fcf7b..c2cee03 100644
--- a/src/templates/categories-list-template.js
+++ b/src/templates/categories-list-template.js
@@ -40,7 +40,7 @@ export const query = graphql`
       }
     }
     allMarkdownRemark(
-      filter: { frontmatter: { layout: { eq: "post" }, draft: { ne: true } } }
+      filter: { frontmatter: { template: { eq: "post" }, draft: { ne: true } } }
     ) {
       group(field: frontmatter___category) {
         fieldValue
diff --git a/src/templates/category-template.js b/src/templates/category-template.js
index 579b88c..b2b81ec 100644
--- a/src/templates/category-template.js
+++ b/src/templates/category-template.js
@@ -51,7 +51,7 @@ export const query = graphql`
     allMarkdownRemark(
         limit: $postsLimit,
         skip: $postsOffset,
-        filter: { frontmatter: { category: { eq: $category }, layout: { eq: "post" }, draft: { ne: true } } },
+        filter: { frontmatter: { category: { eq: $category }, template: { eq: "post" }, draft: { ne: true } } },
         sort: { order: DESC, fields: [frontmatter___date] }
       ){
       edges {
diff --git a/src/templates/index-template.js b/src/templates/index-template.js
index 21186ef..e788714 100644
--- a/src/templates/index-template.js
+++ b/src/templates/index-template.js
@@ -50,7 +50,7 @@ export const query = graphql`
     allMarkdownRemark(
         limit: $postsLimit,
         skip: $postsOffset,
-        filter: { frontmatter: { layout: { eq: "post" }, draft: { ne: true } } },
+        filter: { frontmatter: { template: { eq: "post" }, draft: { ne: true } } },
         sort: { order: DESC, fields: [frontmatter___date] }
       ){
       edges {
diff --git a/src/templates/tag-template.js b/src/templates/tag-template.js
index 3a61b08..af991ec 100644
--- a/src/templates/tag-template.js
+++ b/src/templates/tag-template.js
@@ -51,7 +51,7 @@ export const query = graphql`
     allMarkdownRemark(
         limit: $postsLimit,
         skip: $postsOffset,
-        filter: { frontmatter: { tags: { in: [$tag] }, layout: { eq: "post" }, draft: { ne: true } } },
+        filter: { frontmatter: { tags: { in: [$tag] }, template: { eq: "post" }, draft: { ne: true } } },
         sort: { order: DESC, fields: [frontmatter___date] }
       ){
       edges {
diff --git a/src/templates/tags-list-template.js b/src/templates/tags-list-template.js
index 3d04904..0378ef0 100644
--- a/src/templates/tags-list-template.js
+++ b/src/templates/tags-list-template.js
@@ -39,7 +39,7 @@ export const query = graphql`
       }
     }
     allMarkdownRemark(
-      filter: { frontmatter: { layout: { eq: "post" }, draft: { ne: true } } }
+      filter: { frontmatter: { template: { eq: "post" }, draft: { ne: true } } }
     ) {
       group(field: frontmatter___tags) {
         fieldValue