diff --git a/src/pages/about/about.md b/src/pages/about/about.md
index ffb75ce..cdc340e 100644
--- a/src/pages/about/about.md
+++ b/src/pages/about/about.md
@@ -1,7 +1,6 @@
 ---
-layout: about
-path: /about
 templateKey: 'about-page'
+path: /about
 title: A Dance With Dragons
 ---
 The Dothraki do things in their own time, for their own reasons. Fire and blood. When you play the game of thrones, you win or you die. The Dothraki do things in their own time, for their own reasons. What is dead may never die.
diff --git a/src/pages/blog/2017-08-04-introduction-to-graphql.md b/src/pages/blog/2017-08-04-introduction-to-graphql.md
index bb6a7ba..a4ad0ee 100644
--- a/src/pages/blog/2017-08-04-introduction-to-graphql.md
+++ b/src/pages/blog/2017-08-04-introduction-to-graphql.md
@@ -1,9 +1,8 @@
 ---
-layout: blog
+templateKey: 'blog-post'
 path: /intro-to-graphql
 title: Introduction to GraphQL
 date: 2017-08-08T17:12:33.962Z
-templateKey: 'blog-post'
 ---
 Modern apps are interdependent and dynamic. For example, you probably sign in to various web apps using your GitHub account. These apps may be grabbing your avatar directly from GitHub, or some information about your projects. The data about your project is always changing so, as an added bonus, these connections are constantly updating the information that is displayed.
 
diff --git a/src/pages/blog/2017-10-18-claude-shannon-and-information-theory.md b/src/pages/blog/2017-10-18-claude-shannon-and-information-theory.md
index 1adfe84..e52a312 100644
--- a/src/pages/blog/2017-10-18-claude-shannon-and-information-theory.md
+++ b/src/pages/blog/2017-10-18-claude-shannon-and-information-theory.md
@@ -1,9 +1,8 @@
 ---
-layout: blog
+templateKey: 'blog-post'
 path: /claude
 title: Claude Shannon and Information Theory
 date: 2017-10-14T12:00:02.000Z
-templateKey: 'blog-post'
 ---
 Information theory studies the quantification, storage, and communication of information. It was originally proposed by Claude E. Shannon in 1948 to find fundamental limits on signal processing and communication operations such as data compression, in a landmark paper entitled "A Mathematical Theory of Communication". Applications of fundamental topics of information theory include lossless data compression (e.g. ZIP files), lossy data compression (e.g. MP3s and JPEGs), and channel coding (e.g. for digital subscriber line (DSL)). Its impact has been crucial to the success of the Voyager missions to deep space, the invention of the compact disc, the feasibility of mobile phones, the development of the Internet, the study of linguistics and of human perception, the understanding of black holes, and numerous other fields.
 
diff --git a/src/pages/blog/2017-10-18-einstein-discovers-relativity.md b/src/pages/blog/2017-10-18-einstein-discovers-relativity.md
index 05133c6..c41b154 100644
--- a/src/pages/blog/2017-10-18-einstein-discovers-relativity.md
+++ b/src/pages/blog/2017-10-18-einstein-discovers-relativity.md
@@ -1,9 +1,8 @@
 ---
-layout: blog
+templateKey: 'blog-post'
 path: /einstein
 title: Einstein Discovers Relativity
 date: 2017-10-18T17:12:33.962Z
-templateKey: 'blog-post'
 ---
 In 1905, **Albert Einstein** determined that the laws of physics are the same for all non-accelerating observers, and that the speed of light in a vacuum was independent of the motion of all observers. This was the theory of special **relativity**
 
diff --git a/static/admin/config.yml b/static/admin/config.yml
index d8a15fc..86432cb 100644
--- a/static/admin/config.yml
+++ b/static/admin/config.yml
@@ -1,30 +1,30 @@
 backend:
   name: git-gateway
-  branch: master # Branch to update (optional; defaults to master)
+  branch: master
 
 media_folder: "/src/pages/blog/img"
 public_folder: "img"
 
 collections:
-  - name: "blog" # Used in routes, e.g., /admin/collections/blog
-    label: "Blog" # Used in the UI
-    folder: "src/pages/blog" # The path to the folder where the documents are stored
-    create: true # Allow users to create new documents in this collection
-    slug: "{{year}}-{{month}}-{{day}}-{{slug}}" # Filename template, e.g., YYYY-MM-DD-title.md
-    fields: # The fields for each document, usually in front matter
-      - {label: "Layout", name: "layout", widget: "hidden", default: "blog"}
+  - name: "blog"
+    label: "Blog"
+    folder: "src/pages/blog"
+    create: true
+    slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
+    fields:
+      - {label: "Template Key", name: "templateKey", widget: "hidden", default: "blog-post"}
       - {label: "Path", name: "path", widget: "string"}
       - {label: "Title", name: "title", widget: "string"}
       - {label: "Publish Date", name: "date", widget: "datetime"}
       - {label: "Body", name: "body", widget: "markdown"}
 
-  - name: "about" # Used in routes, e.g., /admin/collections/blog
-    label: "About" # Used in the UI
-    folder: "src/pages/about" # The path to the folder where the documents are stored
-    create: false # Allow users to create new documents in this collection
-    slug: "{{slug}}" # Filename template, e.g., YYYY-MM-DD-title.md
-    fields: # The fields for each document, usually in front matter
-      - {label: "Layout", name: "layout", widget: "hidden", default: "about"}
+  - name: "about"
+    label: "About"
+    folder: "src/pages/about"
+    create: false
+    slug: "{{slug}}"
+    fields:
+      - {label: "Template Key", name: "templateKey", widget: "hidden", default: "about-page"}
       - {label: "Path", name: "path", widget: "hidden", default: "/about"}
       - {label: "Title", name: "title", widget: "string"}
       - {label: "Body", name: "body", widget: "markdown"}