diff --git a/docs/_includes/head.html b/docs/_includes/head.html
index 0038fd0..469730e 100755
--- a/docs/_includes/head.html
+++ b/docs/_includes/head.html
@@ -12,6 +12,6 @@
   {% endif %}
 
   {% if jekyll.environment == 'production' %}
-  {% include analytics.html %}
+    {% include analytics.html %}
   {% endif %}
 </head>
diff --git a/docs/_includes/section-fast-and-scalable.html b/docs/_includes/section-fast-and-scalable.html
index 87fafe1..732d341 100644
--- a/docs/_includes/section-fast-and-scalable.html
+++ b/docs/_includes/section-fast-and-scalable.html
@@ -8,4 +8,4 @@
     Writing an ODS file with millions of rows? {{ site.spout_html }} can do it in no time!
 {% endcapture %}
 
-{% include section.html %}
+{% include section.html site_url = include.site_url %}
diff --git a/docs/_includes/section-supported-spreadsheet-types.html b/docs/_includes/section-supported-spreadsheet-types.html
index 2fefcea..7b7cee0 100644
--- a/docs/_includes/section-supported-spreadsheet-types.html
+++ b/docs/_includes/section-supported-spreadsheet-types.html
@@ -11,4 +11,4 @@
     Switching from one type to another is ridiculously easy!
 {% endcapture %}
 
-{% include section.html %}
+{% include section.html site_url=include.site_url %}
diff --git a/docs/_includes/section-why-use-spout.html b/docs/_includes/section-why-use-spout.html
index ab5ab51..d9a1776 100644
--- a/docs/_includes/section-why-use-spout.html
+++ b/docs/_includes/section-why-use-spout.html
@@ -13,8 +13,9 @@
         <li class="feature-check">{{ site.spout_html }}'s API is {{emS}}developer-friendly{{emE}}.</li>
     </ul><br>
     <div class="btn-wrapper">
-        <a href="{{ site_url }}/getting-started/" class="page-link"><button class="btn">Get started</button></a>
+        <a href="{{ include.site_url }}/getting-started/" class="page-link"><button class="btn">Get started</button></a>
     </div>
+
 {% endcapture %}
 
-{% include section.html %}
+{% include section.html site_url=include.site_url %}
diff --git a/docs/_includes/section.html b/docs/_includes/section.html
index 030d3f1..53d9b05 100755
--- a/docs/_includes/section.html
+++ b/docs/_includes/section.html
@@ -1,4 +1,3 @@
-
 <div class="section {{ sectionClass }} vertical-align-middle">
   <div class="wrapper">
     <div class="description mbl">
@@ -9,7 +8,7 @@
       {% assign sectionIconsAsArray = sectionIcons | split:'~~' %}
       <div class="icons">
       {% for icon in sectionIconsAsArray %}
-        <img src="{{ site_url }}/images/{{ icon }}"/>
+        <img src="{{ include.site_url }}/images/{{ icon }}"/>
       {% endfor %}
       </div>
     {% endif %}
diff --git a/docs/_includes/set-global-site-url.html b/docs/_includes/set-global-site-url.html
new file mode 100644
index 0000000..6c59431
--- /dev/null
+++ b/docs/_includes/set-global-site-url.html
@@ -0,0 +1,12 @@
+{% comment %}
+This is a hack to force using HTTPS...
+The URL of the docs should be changed in the repo settings instead
+{% endcomment %}
+{% assign protocol_scheme = page.url | absolute_url | truncate: 5, "" %}
+{%- capture site_url -%}
+  {%- if protocol_scheme == "https" -%}
+    {{ site.github.url | replace: "http://", "https://" }}
+  {%- else -%}
+    {{ site.github.url }}
+  {%- endif -%}
+{%- endcapture -%}
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 2fd3dd6..b95aab0 100755
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -1,18 +1,7 @@
 <!DOCTYPE html>
 <html>
 
-  {% comment %}
-    This is a hack to force using HTTPS...
-    The URL of the docs should be changed in the repo settings instead
-  {% endcomment %}
-  {% assign protocol_scheme = page.url | absolute_url | truncate: 5, "" %}
-  {%- capture site_url -%}
-    {%- if protocol_scheme == "https" -%}
-      {{ site.github.url | replace: "http", "https" }}
-    {%- else -%}
-      {{ site.github.url }}
-    {%- endif -%}
-  {%- endcapture -%}
+  {% include set-global-site-url.html %}
 
   {% include head.html %}
 
@@ -26,14 +15,6 @@
 
     {{ content }}
 
-<!--
-    <div class="page-content">
-      <div class="wrapper">
-
-      </div>
-    </div>
--->
-
     {% include footer.html %}
     {% include algolia.html %}
 
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html
index d8028d5..3f4c0e6 100755
--- a/docs/_layouts/page.html
+++ b/docs/_layouts/page.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 ---
+
 <article class="post">
   <div class="wrapper">
   <header class="post-header">
diff --git a/docs/_layouts/post.html b/docs/_layouts/post.html
deleted file mode 100755
index 3a0fb52..0000000
--- a/docs/_layouts/post.html
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: default
----
-<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
-
-  <header class="post-header">
-    <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
-    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
-  </header>
-
-  <div class="post-content" itemprop="articleBody">
-    {{ content }}
-  </div>
-
-</article>
diff --git a/docs/_pages/getting-started.md b/docs/_pages/getting-started.md
index a414d27..0004d4d 100755
--- a/docs/_pages/getting-started.md
+++ b/docs/_pages/getting-started.md
@@ -4,6 +4,8 @@ title: Getting Started
 permalink: /getting-started/
 ---
 
+{% include set-global-site-url.html %}
+
 This guide will help you install {{ site.spout_html }} and teach you how to use it.
 
 ## Requirements
diff --git a/docs/_pages/guides.md b/docs/_pages/guides.md
index 10d1159..37cf124 100644
--- a/docs/_pages/guides.md
+++ b/docs/_pages/guides.md
@@ -4,6 +4,8 @@ title: Guides
 permalink: /guides/
 ---
 
+{% include set-global-site-url.html %}
+
 These guides focus on common and more advanced usages of {{ site.spout_html }}.<br>
 If you are just starting with {{ site.spout_html }}, check out the [Getting Started page]({{ site_url }}/getting-started/) and the [Documentation]({{ site_url }}/docs/) first.
 
diff --git a/docs/_pages/index.md b/docs/_pages/index.md
index a2da586..7949b2b 100644
--- a/docs/_pages/index.md
+++ b/docs/_pages/index.md
@@ -5,6 +5,8 @@ title: Spout - Read and write spreadsheets, quickly and at scale
 permalink: /
 ---
 
-{% include section-supported-spreadsheet-types.html %}
-{% include section-fast-and-scalable.html %}
-{% include section-why-use-spout.html %}
+{% include set-global-site-url.html %}
+
+{% include section-supported-spreadsheet-types.html site_url=site_url %}
+{% include section-fast-and-scalable.html site_url=site_url %}
+{% include section-why-use-spout.html site_url=site_url %}
