diff --git a/internal/theme/twentyfifteen/posts/index.gohtml b/internal/theme/twentyfifteen/posts/index.gohtml
index fe2061e..7790759 100644
--- a/internal/theme/twentyfifteen/posts/index.gohtml
+++ b/internal/theme/twentyfifteen/posts/index.gohtml
@@ -20,7 +20,7 @@
                              class="post-{{$v.Id}} post {{if $v.Thumbnail.Path}}has-post-thumbnail{{end}} type-post status-publish format-standard hentry category">
                         {{if $v.Thumbnail.Path}}
                             <a class="post-thumbnail" href="/p/{{$v.Id}}" aria-hidden="true">
-                                <img width="{{$v.Thumbnail.Width}}" height="{{$v.Thumbnail.Height}}" src="{{"siteurl"| getOption}}/wp-content/uploads/{{$v.Thumbnail.Path}}" class="attachment-post-thumbnail size-post-thumbnail wp-post-image" alt="{{$v.PostTitle}}" decoding="async">
+                                <img width="{{$v.Thumbnail.Width}}" height="{{$v.Thumbnail.Height}}" src="{{$v.Thumbnail.Path}}" class="attachment-post-thumbnail size-post-thumbnail wp-post-image" alt="{{$v.PostTitle}}" decoding="async">
                             </a>
                         {{end}}
 
diff --git a/internal/theme/twentyseventeen/posts/index.gohtml b/internal/theme/twentyseventeen/posts/index.gohtml
index 025c7b9..0e4a768 100644
--- a/internal/theme/twentyseventeen/posts/index.gohtml
+++ b/internal/theme/twentyseventeen/posts/index.gohtml
@@ -34,17 +34,16 @@
                                         </time>
                                     </a>
                                 </div>
+                                <h3 class="entry-title">
+                                    <a href="/p/{{$v.Id}}" rel="bookmark">{{$v.PostTitle}}</a>
+                                </h3>
                             </header>
 
-                            <h3 class="entry-title">
-                                <a href="/p/{{$v.Id}}" rel="bookmark">{{$v.PostTitle}}</a>
-                            </h3>
-
 
                             {{if $v.Thumbnail.Path}}
                                 <div class="post-thumbnail">
                                     <a href="/p/{{$v.Id}}" >
-                                        <img width="{{$v.Thumbnail.Width}}" height="{{$v.Thumbnail.Height}}" src="{{"siteurl"| getOption}}/wp-content/uploads/{{$v.Thumbnail.Path}}" class="attachment-twentyseventeen-featured-image size-twentyseventeen-featured-image wp-post-image" alt="{{$v.PostTitle}}" decoding="async" loading="lazy" srcset="{{$v.Thumbnail.Srcset}}" sizes="{{$v.Thumbnail.Sizes}}">
+                                        <img width="{{$v.Thumbnail.Width}}" height="{{$v.Thumbnail.Height}}" src="{{$v.Thumbnail.Path}}" class="attachment-twentyseventeen-featured-image size-twentyseventeen-featured-image wp-post-image" alt="{{$v.PostTitle}}" decoding="async" loading="lazy" srcset="{{$v.Thumbnail.Srcset}}" sizes="{{$v.Thumbnail.Sizes}}">
                                     </a>
                                 </div>
                             {{end}}