diff --git a/_includes/home-users-grid.html b/_includes/home-users-grid.html
index 6330265..c0b44b7 100644
--- a/_includes/home-users-grid.html
+++ b/_includes/home-users-grid.html
@@ -1,22 +1,22 @@
 <div class="home-users-grid">
   <div class="home-users-grid__item">
     <a href="http://jekyllrb.com" target="_blank">
-      <img src="{{ '/images/jekyll-logo.png' | prepend: site.baseurl }}" alt="Jekyll logo" />
+      <img src="{{ '/images/jekyll-logo.png' | relative_url }}" alt="Jekyll logo" />
     </a>
   </div>
   <div class="home-users-grid__item">
     <a href="http://www.desk.com" target="_blank">
-      <img src="{{ '/images/salesforcedesk-logo.png' | prepend: site.baseurl }}" alt="Desk logo" />
+      <img src="{{ '/images/salesforcedesk-logo.png' | relative_url }}" alt="Desk logo" />
     </a>
   </div>
   <div class="home-users-grid__item">
     <a href="//www.zendesk.com" target="_blank">
-      <img src="{{ '/images/zendesk-logo.png' | prepend: site.baseurl }}" alt="ZenDesk logo" />
+      <img src="{{ '/images/zendesk-logo.png' | relative_url }}" alt="ZenDesk logo" />
     </a>
   </div>
   <div class="home-users-grid__item">
     <a href="//500px.com" target="_blank">
-      <img src="{{ '/images/500px-logo.png' | prepend: site.baseurl }}" alt="500px logo" />
+      <img src="{{ '/images/500px-logo.png' | relative_url }}" alt="500px logo" />
     </a>
   </div>
 </div>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index dfe0a12..ac4704b 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -9,7 +9,7 @@
 
     <ul class="section__links">
     {% for item in site.pages %}{% if item.url contains section/ %}{% unless item.path contains "index" %}
-      <li><a href="{{ item.url | prepend: site.baseurl }}" class="section__link{% if item.url contains page.url and page.url != '/' and page.type != 'index' %} section__link--is-active{% endif %}">{{ item.title }}</a></li>
+      <li><a href="{{ item.url | relative_url }}" class="section__link{% if item.url contains page.url and page.url != '/' and page.type != 'index' %} section__link--is-active{% endif %}">{{ item.title }}</a></li>
     {% endunless %}{% endif %}{% endfor %}
     </ul>
     {% endfor %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 00c9b0d..a322f86 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -15,21 +15,21 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
 
-    <link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
-    <link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-32x.png' | prepend: site.baseurl }}" sizes="32x32">
-    <link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-64x.png' | prepend: site.baseurl }}" sizes="64x64">
-    <link rel="canonical" href="{{ page.url | replace: 'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-    <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+    <link rel="stylesheet" href="{{ '/css/main.css' | relative_url }}">
+    <link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-32x.png' | relative_url }}" sizes="32x32">
+    <link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-64x.png' | relative_url }}" sizes="64x64">
+    <link rel="canonical" href="{{ page.url | replace: 'index.html','' | absolute_url }}">
+    <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | relative_url }}" />
 
     <meta property="og:site_name" content="{{ site.title }}">
     <meta property="og:type" content="website">
-    <meta property="og:url" content="{{ site.url | append: site.baseurl }}">
+    <meta property="og:url" content="{{ page.url | relative_url }}">
     <meta property="og:title" content="{{ page.title | default: site.title }}">
     <meta property="og:description" content="{{ page.description | default: site.description }}">
 
     <meta name="twitter:site" content="{{ site.title }}">
     <meta name="twitter:card" content="summary">
-    <meta name="twitter:url" content="{{ site.url | append: site.baseurl }}">
+    <meta name="twitter:url" content="{{ site.url | relative_url }}">
     <meta name="twitter:title" content="{{ page.title | default: site.title }}">
     <meta name="twitter:description" content="{{ page.description | default: site.description }}">
   </head>
@@ -49,6 +49,6 @@
         {{ content }}
       </div>
     </main>
-    <script src="{{ '/js/script.js' | prepend: site.baseurl }}"></script>
+    <script src="{{ '/js/script.js' | relative_url }}"></script>
   </body>
 </html>