diff --git a/default.hbs b/default.hbs
index 358e781..d8163f4 100644
--- a/default.hbs
+++ b/default.hbs
@@ -6,8 +6,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     
     {{! Page Meta }}
-    <title>{{settings.title}}</title>
-    <meta name="description" content="{{settings.description}}" />
+    <title>{{@blog.title}}</title>
+    <meta name="description" content="{{@blog.description}}" />
 
     <meta name="HandheldFriendly" content="True">
     <meta name="MobileOptimized" content="320">
@@ -28,7 +28,7 @@
     <footer class="site-footer">
         <a class="subscribe icon-feed" href="#"><span class="tooltip">Subscribe!</span></a>
         <div class="inner">
-             <section class="copyright">All content copyright <a href="/">{{settings.title}}</a> &copy; 2013 &bull; All rights reserved.</section>
+             <section class="copyright">All content copyright <a href="/">{{@blog.title}}</a> &copy; 2013 &bull; All rights reserved.</section>
              <section class="poweredby">Proudly published with <a class="icon-ghost" href="http://tryghost.org">Ghost</a></section>
         </div>
     </footer>
diff --git a/index.hbs b/index.hbs
index a7290e4..9632632 100644
--- a/index.hbs
+++ b/index.hbs
@@ -7,9 +7,10 @@
 <header id="site-head" {{! style="background-image: url()" }}>
     <div class="vertical">
         <div id="site-head-content" class="inner">
-            {{#if settings.logo}}<a id="blog-logo" href="{{settings.url}}"><img src="{{settings.logo}}" alt="Blog Logo" /></a>{{/if}}
-            <h1 class="blog-title">{{settings.title}}</h1>
-            <h2 class="blog-description">{{settings.description}}</h2>
+
+            {{#if @blog.logo}}<a id="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
+            <h1 class="blog-title">{{@blog.title}}</h1>
+            <h2 class="blog-description">{{@blog.description}}</h2>
         </div>
     </div>
 </header>
diff --git a/post.hbs b/post.hbs
index a1cb73e..a273a47 100644
--- a/post.hbs
+++ b/post.hbs
@@ -9,11 +9,11 @@
         
         {{! Each post has the blog logo at the top, with a link back to the home page }}
         <header class="post-header">
-            <a id="blog-logo" href="{{settings.url}}">
-                {{#if settings.logo}}
-                    <img src="{{settings.logo}}" alt="Blog Logo" />
+            <a id="blog-logo" href="{{@blog.url}}">
+                {{#if @blog.logo}}
+                    <img src="{{@blog.logo}}" alt="Blog Logo" />
                 {{else}}
-                    {{settings.title}}
+                    {{@blog.title}}
                 {{/if}}
             </a>
         </header>
@@ -41,8 +41,8 @@
 
             <section class="share">
                 <h4>Share this post</h4>
-                <a class="icon-twitter" href="http://twitter.com/share?text={{title}}&url={{settings.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
-                <a class="icon-facebook" href="http://www.facebook.com/sharer.php?u={{settings.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
+                <a class="icon-twitter" href="http://twitter.com/share?text={{title}}&url={{@blog.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
+                <a class="icon-facebook" href="http://www.facebook.com/sharer.php?u={{@blog.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
                 <a class="icon-google-plus" href="#"><span class="hidden">Twitter</span></a>
             </section>