diff --git a/404.html b/404.html
index c9e6576f..65cfe894 100644
--- a/404.html
+++ b/404.html
@@ -29,11 +29,11 @@ <h3>Similar URLs</h3>
     </li>
 </script>
 
-<script src="{{ site.baseurl | prepend: site.url }}/js/jquery-1.12.0.min.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/fuzzyset.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/offline.js"></script>
+<script src="{{ "/js/jquery-1.12.0.min.js" | absolute_url }}"></script>
+<script src="{{ "/js/fuzzyset.js" | absolute_url }}"></script>
+<script src="{{ "/js/offline.js" | absolute_url }}"></script>
 <script>
     $(document).ready(function () {
-        insertSimilarUrls(String(window.location.href), "{{ site.baseurl | prepend: site.url }}/api/posts.json", "#article-template", ".urlSuggestions", 10);
+        insertSimilarUrls(String(window.location.href), "{{ "/api/posts.json" | absolute_url }}", "#article-template", ".urlSuggestions", 10);
     });
 </script>
diff --git a/_includes/footer.html b/_includes/footer.html
index b6bafbb9..5daa8906 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,5 @@
 <footer class="site-footer">
     <button class="go-to-top"></button>
-    <p class="copyright"><a href="{{ site.baseurl | prepend: site.url }}" title="{{ site.title }}">{{site.title}}</a> &copy; {{ site.time | date: '%Y' }} | <a href="{{ "/feed.xml" | absolute_url }}" title="RSS Feed">RSS Feed</a></p>
+    <p class="copyright"><a href="{{ "" | absolute_url }}" title="{{ site.title }}">{{site.title}}</a> &copy; {{ site.time | date: '%Y' }} | <a href="{{ "/feed.xml" | absolute_url }}" title="RSS Feed">RSS Feed</a></p>
     <p class="poweredby">powered by <a href="https://jekyllrb.com/" title="Jekyll">Jekyll</a> with the <a href="https://github.com/jwillmer/jekyllDecent" title="jekyllDecent Theme">jekyllDecent</a> theme</p>
 </footer>
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index 4f2f1b4d..da6666f2 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,11 +5,11 @@
 {% endif %}
 
 <header class="main-header detail-page image-bg {% if cover %} has-cover" style="background-image: url({{ cover | absolute_url }})" {% else %} no-cover" {% endif %}>
-    <h1 class="page-title"><a href="{{ site.baseurl | prepend: site.url }}/" title="{{ site.title }}">{{ site.title }}</a></h1>
+    <h1 class="page-title"><a href="{{ "/" | absolute_url }}" title="{{ site.title }}">{{ site.title }}</a></h1>
     <h2 class="page-description">{{ site.subtitle }}</h2>
     <div class="nav">
         <ul>
-            <li><a class="page-link" href="{{ site.baseurl | prepend: site.url }}/" title="Home">Home</a></li>
+            <li><a class="page-link" href="{{ "/" | absolute_url }}" title="Home">Home</a></li>
 
             {% assign pages = site.pages | sort:"weight"  %}
             {% for my_page in pages %}
diff --git a/_includes/post_scripts.html b/_includes/post_scripts.html
index 31495886..96a7e4da 100644
--- a/_includes/post_scripts.html
+++ b/_includes/post_scripts.html
@@ -3,9 +3,9 @@
   'disqus_shortname': '{{ site.disqus_shortname }}'
 };
 </script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/jquery-1.12.0.min.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/jquery.fitvids.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/prism.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/photoswipe.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/photoswipe-ui-default.js"></script>
-<script src="{{ site.baseurl | prepend: site.url }}/js/post.js"></script>
+<script src="{{ "/js/jquery-1.12.0.min.js" | absolute_url }}"></script>
+<script src="{{ "/js/jquery.fitvids.js" | absolute_url }}"></script>
+<script src="{{ "/js/prism.js" | absolute_url }}"></script>
+<script src="{{ "/js/photoswipe.js" | absolute_url }}"></script>
+<script src="{{ "/js/photoswipe-ui-default.js" | absolute_url }}"></script>
+<script src="{{ "/js/post.js" | absolute_url }}"></script>
diff --git a/_includes/twitter-meta.html b/_includes/twitter-meta.html
index c79c548c..6160171a 100644
--- a/_includes/twitter-meta.html
+++ b/_includes/twitter-meta.html
@@ -19,7 +19,7 @@
 
 {% if page.url %}
 {% capture page_url %}{{ page.url | replace:'/index.html','/' | absolute_url  }}{% endcapture %}
-<meta name="twitter:url" content="{{ site.baseurl | prepend: site.url }}">
+<meta name="twitter:url" content="{{ "" | absolute_url }}">
 {% endif %}
 
 <meta name="twitter:description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
diff --git a/_layouts/about.html b/_layouts/about.html
index 22c5a9d7..5670197c 100644
--- a/_layouts/about.html
+++ b/_layouts/about.html
@@ -14,7 +14,7 @@
     {% endunless %}
 {% endfor %}
 
-<a href="{{ site.baseurl | prepend: site.url }}/" class="logo-readium"><span class="logo">{{ author.initial | slice: 0, 2 | downcase }}</span></a>
+<a href="{{ "/" | absolute_url }}" class="logo-readium"><span class="logo">{{ author.initial | slice: 0, 2 | downcase }}</span></a>
 
 <section class="author-profile" itemprop="author" itemscope itemtype="http://schema.org/Person">
     {%  if author.cover %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 08909825..1c97da8d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -10,6 +10,6 @@
     </div>
 </body>
 
-<script src="{{ site.baseurl | prepend: site.url }}/js/global.js"></script>
+<script src="{{ "/js/global.js" | absolute_url}}"></script>
 </script>
 </html>
diff --git a/_layouts/headless.html b/_layouts/headless.html
index 6463f954..007b06a6 100644
--- a/_layouts/headless.html
+++ b/_layouts/headless.html
@@ -9,5 +9,5 @@
     </div>
 </body>
 
-<script src="{{ site.baseurl | prepend: site.url }}/js/global.js"></script>
+<script src="{{ "/js/global.js" | absolute_url}}"></script>
 </html>
diff --git a/api/posts.json b/api/posts.json
index b97f6603..536b6797 100644
--- a/api/posts.json
+++ b/api/posts.json
@@ -6,7 +6,7 @@
     {
         "title": "{{ post.title }}",
         "category": "{{ post.category }}",
-        "url": "{{ post.url | prepend: site.baseurl | prepend: site.url }}",
+        "url": "{{ post.url | absolute_url }}",
         "tags": {{ post.tags | jsonify }},
         "date": "{{ post.date }}",
         "language": "{% if post.language %}{{ post.language | downcase }}{% else %}{{ site.language | downcase }}{% endif %}"
diff --git a/feed.xml b/feed.xml
index 543cf44b..3a646333 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,18 +6,18 @@ layout: null
   <channel>
     <title>{{ site.title | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
-    <link>{{ "" | absolute_url }}/</link>
+    <link>{{ "/" | absolute_url }}</link>
     <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
       <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
-    <generator>Jekyll Av{{ jekyll.version }}</generator>
+    <generator>Jekyll v{{ jekyll.version }}</generator>
     {% for post in site.posts limit:10 %}
       <item>
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
         <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
+        <link>{{ post.url | absolute_url}}</link>
+        <guid isPermaLink="true">{{ post.url | absolute_url }}</guid>
         {% for tag in post.tags %}
         <category>{{ tag | xml_escape }}</category>
         {% endfor %}