diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index b83708c..7f6c618 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -15,15 +15,15 @@
     </div>
     {{ if $params.featured_image }}      
       <div class="summary__image-wrapper">
-        {{ with (print "/images/" $params.featured_image) }}
+        {{ with (print "images/" $params.featured_image) }}
         <img data-src="{{ . | relURL }}" alt="{{ print $params.featured_image }}" class="lazyload summary__image">
         {{ end }}
       </div>
     {{ else if $params.featured_video }}      
-      {{ with (print "/videos/poster/" $params.featured_video_poster) }}
+      {{ with (print "videos/poster/" $params.featured_video_poster) }}
       <div class="video">
-        <video class='video-js' controls preload='none' poster='{{ . | relURL }}' data-setup='{"fluid": true}'>
-          {{ with (print "/videos/" $params.featured_video) }}
+        <video class='video-js' controls preload='none' poster='{{ print (. | relURL) }}' data-setup='{"fluid": true}'>
+          {{ with (print "videos/" $params.featured_video) }}
             <source src="{{ . | relURL }}" type='video/mp4'>
           {{ end }}
           <p class='vjs-no-js'>
diff --git a/layouts/gallery/single.html b/layouts/gallery/single.html
index 8ba559e..faab63e 100644
--- a/layouts/gallery/single.html
+++ b/layouts/gallery/single.html
@@ -19,9 +19,9 @@
 </main>
 {{ partial "body/photoswipe" . }}
 
-{{ $masonry := resources.Get `js/masonry.pkgd.min.js` | fingerprint }}
+{{ $masonry := resources.Get `js/masonry.pkgd.min.js` | resources.Fingerprint }}
 <script defer src="{{ $masonry.RelPermalink }}"></script>
-{{ $imagesloaded := resources.Get `js/imagesloaded.pkgd.min.js` | fingerprint }}
+{{ $imagesloaded := resources.Get `js/imagesloaded.pkgd.min.js` | resources.Fingerprint }}
 <script defer src="{{ $imagesloaded.RelPermalink }}"></script>
 
 <script>
diff --git a/layouts/partials/body/perfectscrollbar.html b/layouts/partials/body/perfectscrollbar.html
index 31a7a30..14c8722 100644
--- a/layouts/partials/body/perfectscrollbar.html
+++ b/layouts/partials/body/perfectscrollbar.html
@@ -1,11 +1,11 @@
 {{ if $.Param "enableCustomScrollbar" }}
 
-{{ $customscrollbar := resources.Get `js/perfect-scrollbar.jquery.min.js` | fingerprint }}
-<script src="{{ $customscrollbar.RelPermalink }}"></script>
+{{ $customscrollbar := resources.Get `js/perfect-scrollbar.jquery.min.js` | resources.Fingerprint }}
+<script defer src="{{ $customscrollbar.RelPermalink }}"></script>
 {{ $customScrollbarStyle := resources.Get "css/perfect-scrollbar.min.css" }}
-<script src="{{ $customScrollbarStyle.RelPermalink }}"></script>
+<script defer src="{{ $customScrollbarStyle.RelPermalink }}"></script>
 
-<script>  
+<script defer>  
   var pre = $('pre');
   pre.perfectScrollbar(); 
 </script>
diff --git a/layouts/partials/body/photoswipe.html b/layouts/partials/body/photoswipe.html
index 870faee..9364c35 100644
--- a/layouts/partials/body/photoswipe.html
+++ b/layouts/partials/body/photoswipe.html
@@ -67,16 +67,16 @@
 
 </div>
 
-{{ $photoSwipe := resources.Get `js/photoswipe.min.js` | fingerprint }}
-<script src="{{ $photoSwipe.RelPermalink }}"></script>
-{{ $photoSwipeUi := resources.Get `js/photoswipe-ui-default.min.js` | fingerprint }}
-<script src="{{ $photoSwipeUi.RelPermalink }}"></script>
-{{ $photoSwipeStyle := resources.Get "css/photoswipe/photoswipe.css" }}
-<script src="{{ $photoSwipeStyle.RelPermalink }}"></script>
-{{ $photoSwipeSkin := resources.Get "css/photoswipe/custom-skin.css" }}
-<script src="{{ $photoSwipeSkin.RelPermalink }}"></script>
+{{ $photoSwipe := resources.Get `js/photoswipe.min.js` | resources.Fingerprint }}
+<script defer src="{{ $photoSwipe.RelPermalink }}"></script>
+{{ $photoSwipeUi := resources.Get `js/photoswipe-ui-default.min.js` | resources.Fingerprint }}
+<script defer src="{{ $photoSwipeUi.RelPermalink }}"></script>
+{{ $photoSwipeStyle := resources.Get "css/photoswipe/photoswipe.css" | resources.Fingerprint }}
+<script defer src="{{ $photoSwipeStyle.RelPermalink }}"></script>
+{{ $photoSwipeSkin := resources.Get "css/photoswipe/custom-skin.css" | resources.Fingerprint }}
+<script defer src="{{ $photoSwipeSkin.RelPermalink }}"></script>
 
-<script>
+<script defer>
   var pswpElement = $('.pswp')[0];
   var imgElements = $('.single__contents').find('img');
   var items = [];
diff --git a/layouts/partials/sidebar/sidebar-single.html b/layouts/partials/sidebar/sidebar-single.html
index 9f921c6..718eb58 100644
--- a/layouts/partials/sidebar/sidebar-single.html
+++ b/layouts/partials/sidebar/sidebar-single.html
@@ -7,10 +7,10 @@
   </div>
 </div>
 
-{{ $toc := resources.Get `js/jquery.toc.min.js` | fingerprint }}
-<script src="{{ $toc.RelPermalink }}"></script>
+{{ $toc := resources.Get `js/jquery.toc.min.js` | resources.Fingerprint }}
+<script defer src="{{ $toc.RelPermalink }}"></script>
 
-<script>
+<script defer>
   var navbar = $('.navbar');
 
   $("#toc").toc({ content: ".single__contents", headings: "h1,h2,h3,h4" });
diff --git a/layouts/partials/sidebar/site-mark.html b/layouts/partials/sidebar/site-mark.html
index c9463ab..c4a982e 100644
--- a/layouts/partials/sidebar/site-mark.html
+++ b/layouts/partials/sidebar/site-mark.html
@@ -1,5 +1,5 @@
 {{ if $.Param "enableMark" }}
-{{ $mark := resources.Get "js/jquery.mark.min.js" | fingerprint }}
+{{ $mark := resources.Get "js/jquery.mark.min.js" | resources.Fingerprint }}
 <script defer src="{{ $mark.RelPermalink }}"></script>
 
 <script>
diff --git a/layouts/partials/sidebar/site-search.html b/layouts/partials/sidebar/site-search.html
index 97a2697..e1cfa19 100644
--- a/layouts/partials/sidebar/site-search.html
+++ b/layouts/partials/sidebar/site-search.html
@@ -12,7 +12,7 @@
 </div>
 
 {{ partial "sidebar/site-mark" . }}
-{{ $lunr := resources.Get "js/lunr.min.js" | fingerprint }}
+{{ $lunr := resources.Get "js/lunr.min.js" | resources.Fingerprint }}
 <script defer src="{{ $lunr.RelPermalink }}"></script>
 
 <script>