diff --git a/author.hbs b/author.hbs
index 708585aa..02ad45fc 100644
--- a/author.hbs
+++ b/author.hbs
@@ -1,6 +1,6 @@
 {{!< default}}
 
-<header class="animated fadeIn" {{#if author.cover}}style="background-image: url({{author.cover}})"{{/if}}>
+<header class="animated fadeIn" {{#if author.cover_image}}style="background-image: url({{author.cover_image}})"{{/if}}>
     <div class="container" data-stellar-ratio="0.75">
         <div class="title animated fadeInUp">
             {{#author}}
@@ -12,7 +12,7 @@
             <div class="published animated fadeInUp">
                 <div class="author-image">
                     {{#author}}
-                        <img src="{{image}}" alt="{{name}}" />
+                        <img src="{{img_url profile_image}}" alt="{{name}}" />
                     {{/author}}
                 </div>
                 <strong class="article-count text-center">{{plural pagination.total empty="No posts" singular="% article" plural="% articles"}}</strong>
diff --git a/default.hbs b/default.hbs
index feccffc5..a4b35404 100644
--- a/default.hbs
+++ b/default.hbs
@@ -35,9 +35,9 @@
         <link rel="apple-touch-icon" href="{{asset 'images/apple-touch-icon.png'}}" />
 
         {{! Prerendering and Prefetching }}
-        {{#if @blog.cover}}
-            <link rel="prerender" href="{{@blog.cover}}" />
-            <link rel="prefetch" href="{{@blog.cover}}" />
+        {{#if @blog.cover_image}}
+            <link rel="prerender" href="{{@blog.cover_image}}" />
+            <link rel="prefetch" href="{{@blog.cover_image}}" />
         {{/if}}
         <link rel="dns-prefetch" href="//fonts.googleapis.com/" />
 
diff --git a/package.json b/package.json
index bc8aae24..d393c3f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Phantom",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "A minimalistic theme for Ghost inspired by the Designmodo Journal.",
   "repository": {
     "type": "git",
diff --git a/page.hbs b/page.hbs
index f78afffe..5d9a0b8e 100644
--- a/page.hbs
+++ b/page.hbs
@@ -4,7 +4,7 @@
 
     {{> post-meta}}
 
-    <header class="animated fadeIn" {{#if @blog.cover}}style="background-image: url({{@blog.cover}})"{{/if}}>
+    <header class="animated fadeIn" {{#if @blog.cover_image}}style="background-image: url({{@blog.cover_image}})"{{/if}}>
         <div class="container" data-stellar-ratio="0.75">
             {{> title}}
             <div class="sidebar text-right meta">
diff --git a/partials/comments.hbs b/partials/comments.hbs
index 26a8ce81..cf81e908 100644
--- a/partials/comments.hbs
+++ b/partials/comments.hbs
@@ -10,7 +10,7 @@
 <script type="text/javascript">
     var disqus_shortname = 'YOUR_SHORTNAME_HERE';
     var disqus_title = '{{title}}';
-    var disqus_identifier = '{{id}}';
+    var disqus_identifier = '{{comment_id}}';
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
diff --git a/partials/cover.hbs b/partials/cover.hbs
index 35b71370..cf30a8c3 100644
--- a/partials/cover.hbs
+++ b/partials/cover.hbs
@@ -1,4 +1,4 @@
-<header class="animated blog-cover fadeIn" {{#if @blog.cover}}style="background-image: url({{@blog.cover}})"{{/if}}>
+<header class="animated blog-cover fadeIn" {{#if @blog.cover_image}}style="background-image: url({{@blog.cover_image}})"{{/if}}>
     <h1 class="blog-title">{{@blog.title}}</h1>
     <h2 class="blog-description">{{@blog.description}}</h2>
 </header>
diff --git a/partials/index-meta.hbs b/partials/index-meta.hbs
index fe514589..9c6c1064 100644
--- a/partials/index-meta.hbs
+++ b/partials/index-meta.hbs
@@ -5,8 +5,8 @@
     <meta property="twitter:url" content="{{@blog.url}}" />
     <meta property="og:description" content="{{@blog.description}}" />
     <meta property="twitter:description" content="{{@blog.description}}" />
-    {{#if @blog.cover}}
-        <meta property="og:image" content="{{@blog.cover}}" />
-        <meta property="twitter:image" content="{{@blog.cover}}" />
+    {{#if @blog.cover_image}}
+        <meta property="og:image" content="{{@blog.cover_image}}" />
+        <meta property="twitter:image" content="{{@blog.cover_image}}" />
     {{/if}}
 {{/contentFor}}
diff --git a/partials/post-meta.hbs b/partials/post-meta.hbs
index 5526105e..c5d04ab1 100644
--- a/partials/post-meta.hbs
+++ b/partials/post-meta.hbs
@@ -6,8 +6,8 @@
     <meta property="twitter:url" content="{{url absolute='true'}}" />
     <meta property="og:description" content="{{excerpt characters='157'}}..." />
     <meta property="twitter:description" content="{{excerpt characters='157'}}..." />
-    {{#if image}}
-        <meta property="og:image" content="{{image}}" />
-        <meta property="twitter:image" content="{{image}}" />
+    {{#if profile_image}}
+        <meta property="og:image" content="{{img_url profile_image}}" />
+        <meta property="twitter:image" content="{{img_url profile_image}}" />
     {{/if}}
 {{/contentFor}}
diff --git a/post.hbs b/post.hbs
index 67c00a10..c12aac8b 100644
--- a/post.hbs
+++ b/post.hbs
@@ -4,7 +4,7 @@
 
     {{> post-meta}}
 
-    <header class="animated fadeIn" {{#if image}}style="background-image: url({{image}})"{{/if}}>
+    <header class="animated fadeIn" {{#if feature_image}}style="background-image: url({{feature_image}})"{{/if}}>
         <div class="container" data-stellar-ratio="0.75">
             {{> title}}
             {{> sidebar}}
@@ -21,7 +21,7 @@
     <div class="container">
         <div class="author animated fadeIn clearfix">
             {{#author}}
-                <img src="{{image}}" alt="{{name}}" />
+                <img src="{{img_url profile_image}}" alt="{{name}}" />
                 <div class="info">
                     <a href="{{url}}" class="name">{{name}}</a>
                     <p class="bio">{{bio}}</p>
diff --git a/tag.hbs b/tag.hbs
index 28bda61c..0ea0666e 100644
--- a/tag.hbs
+++ b/tag.hbs
@@ -1,6 +1,6 @@
 {{!< default}}
 
-<header class="animated fadeIn" {{#if @blog.cover}}style="background-image: url({{@blog.cover}})"{{/if}}>
+<header class="animated fadeIn" {{#if @blog.cover_image}}style="background-image: url({{@blog.cover_image}})"{{/if}}>
     <div class="container" data-stellar-ratio="0.75">
         <div class="title animated fadeInUp">
             <h1>{{tag.name}}</h1>