diff --git a/partials/feature-image.hbs b/partials/feature-image.hbs
index b9d2723..0fa3887 100644
--- a/partials/feature-image.hbs
+++ b/partials/feature-image.hbs
@@ -1,16 +1,15 @@
 {{#if feature_image}}
     <figure class="gh-article-image">
-        <img
-            srcset="{{img_url feature_image size="s"}} 320w,
-                    {{img_url feature_image size="m"}} 600w,
-                    {{img_url feature_image size="l"}} 960w,
-                    {{img_url feature_image size="xl"}} 1200w,
-                    {{img_url feature_image size="xxl"}} 2000w"
-            src="{{img_url feature_image size="xl"}}"
-            alt="{{title}}"
-        >
+        <picture>
+            <source srcset="{{img_url feature_image size="xxl"}}" media="(min-width: 2000px)">
+            <source srcset="{{img_url feature_image size="xl"}}" media="(min-width: 1200px)">
+            <source srcset="{{img_url feature_image size="l"}}" media="(min-width: 960px)">
+            <source srcset="{{img_url feature_image size="m"}}" media="(min-width: 600px)">
+            <source srcset="{{img_url feature_image size="s"}}" media="(min-width: 320px)">
+            <img src="{{img_url feature_image size="xl"}}" alt="{{title}}">
+        </picture>
         {{#if feature_image_caption}}
-            <figcaption>{{feature_image_caption}}</figcaption>
+            <figcaption itemprop="caption">{{feature_image_caption}}</figcaption>
         {{/if}}
     </figure>
 {{/if}}
\ No newline at end of file
diff --git a/post.hbs b/post.hbs
index 61839e9..1803cf1 100644
--- a/post.hbs
+++ b/post.hbs
@@ -19,11 +19,11 @@
 
             {{#if @custom.show_post_metadata}}
             <div class="gh-article-meta">
-                <div class="gh-article-author-image">
+                <div class="gh-article-author-image instapaper_ignore">
                     {{#foreach authors}}
                         {{#if profile_image}}
                             <a href="{{url}}">
-                                <img class="author-profile-image" src="{{img_url profile_image size="xs"}}" alt="{{name}}" />
+                                <img class="author-profile-image" src="{{img_url profile_image size="xs"}}" alt="{{name}}">
                             </a>
                         {{else}}
                             <a href="{{url}}">{{> "icons/avatar"}}</a>