diff --git a/404.md b/404.md
index 0587e87af..df95ce750 100644
--- a/404.md
+++ b/404.md
@@ -5,13 +5,13 @@ description: "Page not found. Your pixels are in another canvas."
 comments: false
 share: false
 permalink: /404.html
----  
+---
 
 Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
 
 <script type="text/javascript">
   var GOOG_FIXURL_LANG = 'en';
-  var GOOG_FIXURL_SITE = '{{ site.url }}'
+  var GOOG_FIXURL_SITE = '{{ site.baseurl | prepend: site.url }}'
 </script>
 <script type="text/javascript"
   src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
diff --git a/_config.yml b/_config.yml
index 3ad5c9ab8..656bbf303 100644
--- a/_config.yml
+++ b/_config.yml
@@ -5,9 +5,8 @@ disqus_shortname:
 reading_time:     true # if true, shows the estimated reading time for a post
 words_per_minute: 200
 logo:             images/logo.png # logo visible in the topbar
-# Your site's domain goes here (eg: //mmistakes.github.io, http://mademistakes.com, etc)
-# When testing locally leave blank or use http://localhost:4000
-# url: http://aronbordin.com/neo-hpstr-jekyll-theme
+url: http://aronbordin.com # the base hostname & protocol for your site
+baseurl: /neo-hpstr-jekyll-theme # the subpath of your site, e.g. /blog
 
 # draw your top menu here
 # each item must have a title and a url.
diff --git a/_includes/author.html b/_includes/author.html
index 1f10746c1..a0af8c442 100644
--- a/_includes/author.html
+++ b/_includes/author.html
@@ -5,7 +5,7 @@
   <div class="read-more-content author-info">
     <h3>{{site.owner.name}}</h3>
     <div class="author-container">
-      <img class="author-img" src="{{site.url}}/{{site.owner.avatar}}" alt="{{site.owner.name}}" />
+      <img class="author-img" src="{{ site.baseurl }}/{{ site.owner.avatar }}" alt="{{site.owner.name}}" />
       <div class="author-bio">{{site.owner.bio}}</div>
     </div>
     <div class="author-share">
diff --git a/_includes/feed-footer.html b/_includes/feed-footer.html
index 02a94f6a8..bfbd28397 100644
--- a/_includes/feed-footer.html
+++ b/_includes/feed-footer.html
@@ -1 +1 @@
-&lt;p&gt;&lt;a href=&quot;{{ site.url }}{{ post.url }}&quot;&gt;{{ post.title | xml_escape }}&lt;/a&gt; was originally published by {{ site.owner.name }} at &lt;a href=&quot;{{ site.url }}&quot;&gt;{{ site.title }}&lt;/a&gt; on {{ post.date | date: "%B %d, %Y" }}.&lt;/p&gt;
\ No newline at end of file
+&lt;p&gt;&lt;a href=&quot;{{ post.url | prepend: site.baseurl | prepend: site.url }}&quot;&gt;{{ post.title | xml_escape }}&lt;/a&gt; was originally published by {{ site.owner.name }} at &lt;a href=&quot;{{ site.baseurl | prepend: site.url }}&quot;&gt;{{ site.title }}&lt;/a&gt; on {{ post.date | date: "%B %d, %Y" }}.&lt;/p&gt;
diff --git a/_includes/head.html b/_includes/head.html
index 60f1d16d7..2a6165d35 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -14,17 +14,15 @@
 <meta property="og:type" content="article">
 <meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
 <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
-<meta property="og:url" content="{{ site.url }}{{ page.url }}">
+<meta property="og:url" content="{{ page.url | prepend: site.baseurl | prepend: site.url }}">
 <meta property="og:site_name" content="{{ site.title }}">
-{% if page.image.feature %}<meta property="og:image" content="{{ site.url }}/images/{{ page.image.feature }}">
-{% else %}<meta property="og:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/{{ site.logo }}{% endif %}">{% endif %}
+<meta property="og:image" content="{{ "/images/" | prepend: site.baseurl | prepend: site.url }}{% if page.image.feature %}{{ page.image.feature }}{% else %}{% if page.image.thumb %}{{ page.image.thumb }}{% else %}{{ site.logo }}{% endif %}{% endif %}">
 
 {% if site.google_verify %}<meta name="google-site-verification" content="{{ site.google_verify }}">{% endif %}
 {% if site.bing_verify %}<meta name="msvalidate.01" content="{{ site.bing_verify }}">{% endif %}
 
-{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
-<link rel="canonical" href="{{ canonical }}">
-<link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
+<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+<link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
 
 <!-- http://t.co/dKP3o1e -->
 <meta name="HandheldFriendly" content="True">
@@ -32,21 +30,21 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/>
 
 <!-- For all browsers -->
-<link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
-<link rel="stylesheet" href="{{ site.url }}/assets/css/jquery.mmenu.all.css">
-<link rel="stylesheet" href="{{ site.url }}/assets/css/jquery.floating-social-share.min.css">
+<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ "/assets/css/jquery.mmenu.all.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ "/assets/css/jquery.floating-social-share.min.css" | prepend: site.baseurl }}">
 <!-- Webfonts -->
 <link href="//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic" rel="stylesheet" type="text/css">
 
 <meta http-equiv="cleartype" content="on">
 
 <!-- Load Modernizr -->
-<script type="text/javascript" src="{{ site.url }}/assets/js/vendor/modernizr-2.6.2.custom.min.js"></script>
+<script type="text/javascript" src="{{ "/assets/js/vendor/modernizr-2.6.2.custom.min.js" | prepend: site.baseurl }}"></script>
 
 {% include icons.html %}
 
 {% if page.image.background or site.background %}
 {% capture background %}{% if page.image.background %}{{ page.image.background }}{% else %}{{ site.background }}{% endif %}{% endcapture %}
-{% unless background contains 'http://' or background contains 'https://' %}{% capture background %}{{ site.url }}/images/{{ background }}{% endcapture %}{% endunless %}
+{% unless background contains 'http://' or background contains 'https://' %}{% capture background %}{{ background | prepend: "/images/" | prepend: site.baseurl }}{% endcapture %}{% endunless %}
 <style type="text/css">body {background-image:url({{ background }});}</style>
 {% endif %}
diff --git a/_includes/header.html b/_includes/header.html
index 73ccb8fe4..af88e9774 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,11 +5,11 @@
     <ul class="header-item-container">
       <li class="header-item-title header-toggle "><a href="#menu"><h2><i class="fa fa-bars"></i></h2></a></li>
       <li class="header-item-title">
-        <a href="{{site.url}}/">
+        <a href="{{ site.baseurl }}/">
           {% if site.logo %}
-            <img class="logo" src="{{site.url}}/{{ site.logo }}" alt="{{ site.title }}">
+            <img class="logo" src="{{ site.baseurl }}/{{ site.logo }}" alt="{{ site.title }}">
           {% endif %}
-          <a href="{{site.url}}/" class="title"> {{ site.title }}</a>
+          <a href="{{ site.baseurl }}/" class="title"> {{ site.title }}</a>
         </a>
       </li>
       {% for menu in site.menu reversed %}
@@ -19,7 +19,7 @@
         {% endif %}
 
         {% if menu.type == 'categories' %}
-          <li class="header-item {{class}}"><a href="{{site.url}}{{menu.url}}"><h3>{{ menu.title }}</h3></a>
+          <li class="header-item {{class}}"><a href="{{ site.baseurl }}{{ menu.url }}"><h3>{{ menu.title }}</h3></a>
             <ul class="header-submenu">
               {% for item in (0..site.categories.size) %}{% unless forloop.last %}
                 {% capture this_word %}{{ cats_list[item] | strip_newlines }}{% endcapture %}
@@ -28,10 +28,10 @@
             </ul>
           </li>
         {% elsif menu.submenu %}
-          <li class="header-item {{class}}"><a href="{{site.url}}{{menu.url}}"><h3>{{ menu.title }}</h3></a>
+          <li class="header-item {{class}}"><a href="{{ site.baseurl }}{{ menu.url }}"><h3>{{ menu.title }}</h3></a>
             <ul class="header-submenu">
               {% for sub in menu.submenu %}
-                <li class="sub-item"><a href="{{site.url}}{{sub.url}}">{{sub.title}}</a></li>
+                <li class="sub-item"><a href="{{ site.baseurl }}{{ sub.url }}">{{sub.title}}</a></li>
               {% endfor %}
             </ul>
           </li>
@@ -39,11 +39,11 @@
             {% if menu.url contains 'http://' or menu.url contains 'https://' %}
                 <li class="header-item {{class}}"><a href="{{menu.url}}" target="_blank"><h3>{{ menu.title }}</h3></a></li>
             {% else %}
-                <li class="header-item {{class}}"><a href="{{site.url}}{{menu.url}}"><h3>{{ menu.title }}</h3></a></li>
+                <li class="header-item {{class}}"><a href="{{ site.baseurl }}{{ menu.url }}"><h3>{{ menu.title }}</h3></a></li>
             {% endif %}
         {% endif %}
       {% endfor %}
-      <li class="header-item"><a href="{{site.url}}/search"><h3><i class="fa fa-search"></i></h3></a></li>
+      <li class="header-item"><a href="{{ "/search" | prepend: site.baseurl }}"><h3><i class="fa fa-search"></i></h3></a></li>
     </ul>
   </div>
 <div class="entry-header">
@@ -76,24 +76,24 @@ <h2><span class="entry-date"><time>&nbsp;</time></span></h2>
   <ul>
     {% for menu in site.menu %}
       {% if menu.type == 'categories' %}
-        <li><a href="{{site.url}}{{menu.url}}"><h3>{{ menu.title }}</h3></a>
+        <li><a href="{{ site.baseurl }}{{ menu.url }}"><h3>{{ menu.title }}</h3></a>
           <ul>
             {% for item in (0..site.categories.size) %}{% unless forloop.last %}
               {% capture this_word %}{{ cats_list[item] | strip_newlines }}{% endcapture %}
-                <li><a href="{{site.url}}/categories/#{{this_word}}">{{this_word}}</a></li>
+                <li><a href="{{ site.baseurl }}/categories/#{{this_word}}">{{this_word}}</a></li>
             {% endunless %}{% endfor %}
           </ul>
         </li>
       {% elsif menu.submenu %}
-        <li><a href="{{site.url}}{{menu.url}}"><h3>{{ menu.title }}</h3></a>
+        <li><a href="{{ site.baseurl }}{{ menu.url }}"><h3>{{ menu.title }}</h3></a>
           <ul>
             {% for sub in menu.submenu %}
-              <li><a href="{{site.url}}{{sub.url}}">{{sub.title}}</a></li>
+              <li><a href="{{ site.baseurl }}{{ sub.url }}">{{sub.title}}</a></li>
             {% endfor %}
           </ul>
         </li>
       {% else %}
-        <li><a href="{{site.url}}{{menu.url}}"><h3>{{ menu.title }}</h3></a></li>
+        <li><a href="{{ site.baseurl }}{{ menu.url }}"><h3>{{ menu.title }}</h3></a></li>
       {% endif %}
     {% endfor %}
   </ul>
diff --git a/_includes/icons.html b/_includes/icons.html
index 1417cf93b..feebdc9dd 100644
--- a/_includes/icons.html
+++ b/_includes/icons.html
@@ -1,13 +1,13 @@
 <!-- Icons -->
 <!-- 16x16 -->
-<link rel="shortcut icon" href="{{ site.url }}/favicon.ico">
+<link rel="shortcut icon" href="{{ "/favicon.ico" | prepend: site.baseurl }}">
 <!-- 32x32 -->
-<link rel="shortcut icon" href="{{ site.url }}/favicon.png">
+<link rel="shortcut icon" href="{{ "/favicon.png" | prepend: site.baseurl }}">
 <!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
-<link rel="apple-touch-icon-precomposed" href="{{ site.url }}/images/apple-touch-icon-precomposed.png">
+<link rel="apple-touch-icon-precomposed" href="{{ "/images/apple-touch-icon-precomposed.png" | prepend: site.baseurl }}">
 <!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
-<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.url }}/images/apple-touch-icon-72x72-precomposed.png">
+<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ "/images/apple-touch-icon-72x72-precomposed.png" | prepend: site.baseurl }}">
 <!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.url }}/images/apple-touch-icon-114x114-precomposed.png">
+<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ "/images/apple-touch-icon-114x114-precomposed.png" | prepend: site.baseurl }}">
 <!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.url }}/images/apple-touch-icon-144x144-precomposed.png">
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ "/images/apple-touch-icon-144x144-precomposed.png" | prepend: site.baseurl }}">
diff --git a/_includes/pagination.html b/_includes/pagination.html
index 3d103ecc4..4df8124b1 100644
--- a/_includes/pagination.html
+++ b/_includes/pagination.html
@@ -4,9 +4,9 @@
     {% comment %} Link for previous page {% endcomment %}
     {% if paginator.previous_page %}
       {% if paginator.previous_page == 1 %}
-        <li><a href="{{ site.url }}/" class="btn">Previous</a></li>
+        <li><a href="{{ site.baseurl }}/" class="btn">Previous</a></li>
       {% else %}
-        <li><a href="{{ site.url }}/page{{ paginator.previous_page }}/" class="btn">Previous</a></li>
+        <li><a href="{{ site.baseurl }}/page{{ paginator.previous_page }}/" class="btn">Previous</a></li>
       {% endif %}
     {% endif %}
 
@@ -14,7 +14,7 @@
     {% if paginator.page == 1 %}
       <li><strong class="current-page">1</strong></li>
     {% else %}
-      <li><a href="{{ site.url }}/">1</a></li>
+      <li><a href="{{ site.baseurl }}/">1</a></li>
     {% endif %}
 
     {% assign page_start = 2 %}
@@ -40,7 +40,7 @@
           {% comment %} Distance must be a positive value {% endcomment %}
           {% assign dist = 0 | minus: dist %}
         {% endif %}
-        <li><a href="{{ site.url }}/page{{ index }}/">{{index}}</a></li>
+        <li><a href="{{ site.baseurl }}/page{{ index }}/">{{index}}</a></li>
       {% endif %}
     {% endfor %}
 
@@ -52,14 +52,14 @@
     {% if paginator.page == paginator.total_pages %}
       <li><strong class="current-page">{{ paginator.page }}</strong></li>
     {% else %}
-      <li><a href="{{ site.url }}/page{{ paginator.total_pages }}/">{{ paginator.total_pages }}</a></li>
+      <li><a href="{{ site.baseurl }}/page{{ paginator.total_pages }}/">{{ paginator.total_pages }}</a></li>
     {% endif %}
 
     {% comment %}
       Link next page
     {% endcomment %}
     {% if paginator.next_page %}
-      <li><a href="{{ site.url }}/page{{ paginator.next_page }}/" class="btn">Next</a></li>
+      <li><a href="{{ site.baseurl }}/page{{ paginator.next_page }}/" class="btn">Next</a></li>
     {% endif %}
   </ul>
 </div>
diff --git a/_includes/read-more.html b/_includes/read-more.html
index 97afc0fef..64b2e071f 100644
--- a/_includes/read-more.html
+++ b/_includes/read-more.html
@@ -1,17 +1,17 @@
 <div class="read-more">
   {% for post in site.related_posts limit:1 %}
     <div class="read-more-header">
-      <a href="{{ site.url }}{{ page.previous.url }}" class="read-more-btn">Read More</a>
+      <a href="{{ site.baseurl }}{{ page.previous.url }}" class="read-more-btn">Read More</a>
     </div><!-- /.read-more-header -->
     <div class="read-more-content">
-      <h3><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h3>
-      <p>{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 140 }}&hellip;{% endif %} <a href="{{ site.url }}{{ post.url }}">Continue reading</a></p>
+      <h3><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h3>
+      <p>{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 140 }}&hellip;{% endif %} <a href="{{ site.baseurl }}{{ post.url }}">Continue reading</a></p>
     </div><!-- /.read-more-content -->
   {% endfor %}
   <div class="read-more-list">
     {% for post in site.related_posts limit:2 offset:1 %}
       <div class="list-item">
-        <h4><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h4>
+        <h4><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h4>
         <span>Published on {{ post.date | date: "%B %d, %Y" }}</span>
       </div><!-- /.list-item -->
     {% endfor %}
diff --git a/_includes/scripts.html b/_includes/scripts.html
index bdceed4fd..dfdb8187c 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript">window.jQuery || document.write('<script type="text/javascript" src="{{ site.url }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
-<script type="text/javascript" src="{{ site.url }}/assets/js/scripts.min.js"></script>
+<script type="text/javascript">window.jQuery || document.write('<script type="text/javascript" src="{{ "/assets/js/vendor/jquery-1.9.1.min.js" | prepend: site.baseurl }}"><\/script>')</script>
+<script type="text/javascript" src="{{ "/assets/js/scripts.min.js" | prepend: site.baseurl }}"></script>
 <script type="text/javascript" async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
 <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 
diff --git a/_includes/social-share.html b/_includes/social-share.html
index d6f72d02e..abf0facbb 100644
--- a/_includes/social-share.html
+++ b/_includes/social-share.html
@@ -1,7 +1,7 @@
-<div class="social-share">
+{% capture shareurl %}{{ page.url | prepend: site.baseurl | prepend: site.url }}{% endcapture %}<div class="social-share">
   <ul class="socialcount socialcount-small inline-list">
-    <li class="facebook"><a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" title="Share on Facebook"><span class="count"><i class="fa fa-facebook-square"></i> Like</span></a></li>
-    <li class="twitter"><a href="https://twitter.com/intent/tweet?text={{ site.url }}{{ page.url }}" title="Share on Twitter"><span class="count"><i class="fa fa-twitter-square"></i> Tweet</span></a></li>
-    <li class="googleplus"><a href="https://plus.google.com/share?url={{ site.url }}{{ page.url }}" title="Share on Google Plus"><span class="count"><i class="fa fa-google-plus-square"></i> +1</span></a></li>
+    <li class="facebook"><a href="https://www.facebook.com/sharer/sharer.php?u={{ shareurl }}" title="Share on Facebook"><span class="count"><i class="fa fa-facebook-square"></i> Like</span></a></li>
+    <li class="twitter"><a href="https://twitter.com/intent/tweet?text={{ shareurl }}" title="Share on Twitter"><span class="count"><i class="fa fa-twitter-square"></i> Tweet</span></a></li>
+    <li class="googleplus"><a href="https://plus.google.com/share?url={{ shareurl }}" title="Share on Google Plus"><span class="count"><i class="fa fa-google-plus-square"></i> +1</span></a></li>
   </ul>
 </div><!-- /.social-share -->
diff --git a/_layouts/dark-post.html b/_layouts/dark-post.html
index 35e476428..e36d3cccd 100644
--- a/_layouts/dark-post.html
+++ b/_layouts/dark-post.html
@@ -17,14 +17,14 @@
     <div class="entry-content">
       {% if page.image.feature %}
           <div class="entry-image-index">
-            <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
+            <img src="{{ site.baseurl }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
             {% if page.image.credit %}<div class="image-credit">Image source: <a target="_blank" href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %}
           </div>
       {% endif %}
       <h1 class="post-title entry-title">{{ page.title }}</h1>
       {{ content }}
       <footer class="entry-meta">
-        <span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags#{{ tag }}" title="Pages tagged {{ tag }}" class="tag"><span class="term">{{ tag }}</span></a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
+        <span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.baseurl }}/tags#{{ tag }}" title="Pages tagged {{ tag }}" class="tag"><span class="term">{{ tag }}</span></a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
         {% if page.modified %}<span>Updated on <span class="entry-date date updated"><time datetime="{{ page.modified }}">{{ page.modified | date: "%B %d, %Y" }}</time></span></span>
         {% endif %}
         <span class="author vcard"><span class="fn">{{ site.owner.name }}</span></span>
diff --git a/_layouts/post.html b/_layouts/post.html
index 6883e153c..793759084 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -17,14 +17,14 @@
     <div class="entry-content">
         {% if page.image.feature %}
             <div class="entry-image-index">
-              <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
+              <img src="{{ site.baseurl }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
               {% if page.image.credit %}<div class="image-credit">Image source: <a target="_blank" href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %}
             </div>
         {% endif %}
       <h1 class="post-title entry-title">{{ page.title }}</h1>
       {{ content }}
       <footer class="entry-meta">
-        <span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags#{{ tag }}" title="Pages tagged {{ tag }}" class="tag"><span class="term">{{ tag }}</span></a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
+        <span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.baseurl }}/tags#{{ tag }}" title="Pages tagged {{ tag }}" class="tag"><span class="term">{{ tag }}</span></a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
         {% if page.modified %}<span>Updated on <span class="entry-date date updated"><time datetime="{{ page.modified }}">{{ page.modified | date: "%B %d, %Y" }}</time></span></span>
         {% endif %}
         <span class="author vcard"><span class="fn">{{ site.owner.name }}</span></span>
diff --git a/_posts/2011-03-10-sample-post.md b/_posts/2011-03-10-sample-post.md
index 44e71696a..272e7185e 100644
--- a/_posts/2011-03-10-sample-post.md
+++ b/_posts/2011-03-10-sample-post.md
@@ -25,7 +25,7 @@ Below is just about everything you'll need to style in the theme. Check the sour
 
 Lorem ipsum dolor sit amet, test link adipiscing elit. **This is strong**. Nullam dignissim convallis est. Quisque aliquam.
 
-![Smithsonian Image]({{ site.url }}/images/3953273590_704e3899d5_m.jpg)
+![Smithsonian Image]({{ site.baseurl }}/images/3953273590_704e3899d5_m.jpg)
 {: .image-right}
 
 *This is emphasized*. Donec faucibus. Nunc iaculis suscipit dui. 53 = 125. Water is H<sub>2</sub>O. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. The New York Times <cite>(That’s a citation)</cite>. <u>Underline</u>. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
diff --git a/_posts/2013-08-16-code-highlighting-post.md b/_posts/2013-08-16-code-highlighting-post.md
index 32d99d1be..3e4238dfb 100644
--- a/_posts/2013-08-16-code-highlighting-post.md
+++ b/_posts/2013-08-16-code-highlighting-post.md
@@ -27,10 +27,10 @@ To modify styling and highlight colors edit `/_sass/_rouge.scss`.
 {% raw %}
 <nav class="pagination" role="navigation">
     {% if page.previous %}
-        <a href="{{ site.url }}{{ page.previous.url }}" class="btn" title="{{ page.previous.title }}">Previous article</a>
+        <a href="{{ page.previous.url | prepend: site.baseurl }}" class="btn" title="{{ page.previous.title }}">Previous article</a>
     {% endif %}
     {% if page.next %}
-        <a href="{{ site.url }}{{ page.next.url }}" class="btn" title="{{ page.next.title }}">Next article</a>
+        <a href="{{ page.next.url | prepend: site.baseurl }}" class="btn" title="{{ page.next.title }}">Next article</a>
     {% endif %}
 </nav><!-- /.pagination -->
 {% endraw %}
@@ -61,10 +61,10 @@ end
     {% raw %}
     <nav class="pagination" role="navigation">
         {% if page.previous %}
-            <a href="{{ site.url }}{{ page.previous.url }}" class="btn" title="{{ page.previous.title }}">Previous article</a>
+            <a href="{{ page.previous.url | prepend: site.baseurl }}" class="btn" title="{{ page.previous.title }}">Previous article</a>
         {% endif %}
         {% if page.next %}
-            <a href="{{ site.url }}{{ page.next.url }}" class="btn" title="{{ page.next.title }}">Next article</a>
+            <a href="{{ page.next.url | prepend: site.baseurl }}" class="btn" title="{{ page.next.title }}">Next article</a>
         {% endif %}
     </nav><!-- /.pagination -->
     {% endraw %}
diff --git a/categories/index.html b/categories/index.html
index 8071462d1..55e6a9e70 100644
--- a/categories/index.html
+++ b/categories/index.html
@@ -21,7 +21,7 @@
 	<h2 id="{{ this_word }}" class="tag-heading">{{ this_word }}</h2>
 		<ul>
     {% for post in site.categories[this_word] %}{% if post.title != null %}
-      <li class="entry-title"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
+      <li class="entry-title"><a href="{{ post.url | prepend: site.baseurl }}" title="{{ post.title }}">{{ post.title }}</a></li>
     {% endif %}{% endfor %}
 		</ul>
 	</article><!-- /.hentry -->
diff --git a/feed.xml b/feed.xml
index 905ec7c59..f97c8bc65 100644
--- a/feed.xml
+++ b/feed.xml
@@ -5,28 +5,28 @@ layout: null
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
 <title type="text">{{ site.title }}</title>
 <generator uri="https://github.com/mojombo/jekyll">Jekyll</generator>
-<link rel="self" type="application/atom+xml" href="{{ site.url }}/feed.xml" />
-<link rel="alternate" type="text/html" href="{{ site.url }}" />
+<link rel="self" type="application/atom+xml" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+<link rel="alternate" type="text/html" href="{{ site.baseurl | prepend: site.url }}" />
 <updated>{{ site.time | date_to_xmlschema }}</updated>
-<id>{{ site.url }}/</id>
+<id>{{ site.baseurl | prepend: site.url }}/</id>
 <author>
   <name>{{ site.owner.name }}</name>
-  <uri>{{ site.url }}/</uri>
+  <uri>{{ site.baseurl | prepend: site.url }}/</uri>
   {% if site.owner.email %}<email>{{ site.owner.email }}</email>{% endif %}
 </author>
 {% for post in site.posts limit:20 %}
 
 <entry>
   <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title>
- <link rel="alternate" type="text/html" href="{% if post.link %}{{ post.link }}{% else %}{{ site.url }}{{ post.url }}{% endif %}" />
-  <id>{{ site.url }}{{ post.id }}</id>
+ <link rel="alternate" type="text/html" href="{% if post.link %}{{ post.link }}{% else %}{{ post.url | prepend: site.baseurl | prepend: site.url }}{% endif %}" />
+  <id>{{ post.id | prepend: site.baseurl | prepend: site.url }}</id>
   {% if post.modified %}<updated>{{ post.modified | to_xmlschema }}T00:00:00-00:00</updated>
   <published>{{ post.date | date_to_xmlschema }}</published>
   {% else %}<published>{{ post.date | date_to_xmlschema }}</published>
   <updated>{{ post.date | date_to_xmlschema }}</updated>{% endif %}
   <author>
     <name>{{ site.owner.name }}</name>
-    <uri>{{ site.url }}</uri>
+    <uri>{{ site.baseurl | prepend: site.url }}</uri>
     <email>{{ site.owner.email }}</email>
   </author>
   <content type="html">
diff --git a/index.html b/index.html
index 248a1a4ae..a6fc5c41c 100644
--- a/index.html
+++ b/index.html
@@ -11,13 +11,13 @@
   <header>
     {% if post.image.feature %}
       <div class="entry-image-index">
-        <a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}"><img src="{{ site.url }}/images/{{ post.image.feature }}" alt="{{ post.title }}"></a>
+        <a href="{{ post.url | prepend: site.baseurl }}" title="{{ post.title }}"><img src="{{ post.image.feature | prepend: "/images/" | prepend: site.baseurl }}" alt="{{ post.title }}"></a>
         {% if post.image.credit %}<div class="image-credit">Image source: <a target="_blank" href="{{ post.image.creditlink }}">{{ post.image.credit }}</a></div><!-- /.image-credit -->{% endif %}
 
       </div><!-- /.entry-image -->
     {% endif %}
     <div class="entry-meta">
-      <span class="entry-date date published updated"><time datetime="{{ post.date | date_to_xmlschema }}"><a href="{{ site.url }}{{ post.url }}">{{ post.date | date: "%B %d, %Y" }}</a></time></span><span class="author vcard"><span class="fn"><a href="{{ site.url }}/about/" title="About {{ site.owner.name }}">{{ site.owner.name }}</a></span></span>
+      <span class="entry-date date published updated"><time datetime="{{ post.date | date_to_xmlschema }}"><a href="{{ post.url | prepend: site.baseurl }}">{{ post.date | date: "%B %d, %Y" }}</a></time></span><span class="author vcard"><span class="fn"><a href="/about/" title="About {{ site.owner.name }}">{{ site.owner.name }}</a></span></span>
       {% if site.reading_time %}
       <span class="entry-reading-time">
         <i class="fa fa-clock-o"></i>
@@ -27,9 +27,9 @@
       {% endif %}
     </div><!-- /.entry-meta -->
     {% if post.link %}
-      <h1 class="entry-title"><a href="{{ site.url }}{{ post.url }}" class="permalink" rel="bookmark" title="{{ post.title }}"><i class="fa fa-bookmark"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1>
+      <h1 class="entry-title"><a href="{{ post.url | prepend: site.baseurl }}" class="permalink" rel="bookmark" title="{{ post.title }}"><i class="fa fa-bookmark"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1>
     {% else %}
-      <h1 class="entry-title"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1>
+      <h1 class="entry-title"><a href="{{ post.url | prepend: site.baseurl }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1>
     {% endif %}
   </header>
   <div class="entry-content">
diff --git a/posts/index.html b/posts/index.html
index f6da2b806..44793bb6f 100644
--- a/posts/index.html
+++ b/posts/index.html
@@ -15,7 +15,7 @@ <h2 id="{{ this_year }}-ref">{{ this_year }}</h2>
       <ul>
     {% endif %}
 
-        <li class="entry-title"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
+        <li class="entry-title"><a href="{{ post.url | prepend: site.baseurl }}" title="{{ post.title }}">{{ post.title }}</a></li>
 
     {% if forloop.last %}
       </ul>
diff --git a/search.json b/search.json
index 644baa070..debf66120 100644
--- a/search.json
+++ b/search.json
@@ -6,7 +6,7 @@
       "title"    : "{{ post.title | escape }}",
       "category" : "{{ post.category }}",
       "tags"     : "{{ post.tags | join: ', ' }}",
-      "url"      : "{{ site.url }}{{ post.url }}",
+      "url"      : "{{ post.url | prepend: site.baseurl | prepend: site.url }}",
       "date"     : "{{ post.date }}"
     } {% unless forloop.last %},{% endunless %}
   {% endfor %}
diff --git a/search/index.html b/search/index.html
index 3548600a0..070d0650a 100644
--- a/search/index.html
+++ b/search/index.html
@@ -20,7 +20,7 @@ <h3>Results:</h3>
     new SimpleJekyllSearch({
       searchInput: document.getElementById('search-input'),
       resultsContainer: document.getElementById('results-container'),
-      json: '{{site.url}}/search.json',
+      json: '{{ "/search.json" | prepend: site.baseurl }}',
       searchResultTemplate: '<li class="entry-title"><a href="{url}" title="{title}">{title}</a></li>'
     });
   }
diff --git a/tags/index.html b/tags/index.html
index 77da5ea0d..a0c53c12e 100644
--- a/tags/index.html
+++ b/tags/index.html
@@ -21,7 +21,7 @@
 	<h2 id="{{ this_word }}" class="tag-heading">{{ this_word }}</h2>
 		<ul>
     {% for post in site.tags[this_word] %}{% if post.title != null %}
-      <li class="entry-title"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
+      <li class="entry-title"><a href="{{ post.url | prepend: site.baseurl }}" title="{{ post.title }}">{{ post.title }}</a></li>
     {% endif %}{% endfor %}
 		</ul>
 	</article><!-- /.hentry -->
diff --git a/theme-setup/index.md b/theme-setup/index.md
index 46c1c7c3d..55b7e892f 100644
--- a/theme-setup/index.md
+++ b/theme-setup/index.md
@@ -37,9 +37,8 @@ disqus_shortname: neohpstrtheme # put your disqus here
 reading_time:     true # if true, shows the estimated reading time for a post
 words_per_minute: 200
 logo:             images/logo.png # logo visible in the topbar
-# Your site's domain goes here (eg: //mmistakes.github.io, http://mademistakes.com, etc)
-# When testing locally leave blank or use http://localhost:4000
-# url: http://aronbordin.com/neo-hpstr-jekyll-theme
+url: http://aronbordin.com # the base hostname & protocol for your site
+baseurl: /neo-hpstr-jekyll-theme # the subpath of your site, e.g. /blog
 
 # draw your top menu here
 # each item must have a title and a url.
@@ -194,7 +193,7 @@ hpstr-jekyll-theme/
 
 ## Customization
 
-Most of the variables found here are used in the .html files found in `_includes` if you need to add or remove anything. A good place to start would be to add the `title`, `description`, and `url` for your site. Links are absolute and prefixed with `{{ "{{ site.url " }}}}` in the various `_includes` and `_layouts`, so remember to properly set `url`[^1] to `http://localhost:4000` when developing locally.
+Most of the variables found here are used in the .html files found in `_includes` if you need to add or remove anything. A good place to start would be to add the `title`, `description`, and `url` for your site.
 
 ### Disqus Comments
 
@@ -305,7 +304,7 @@ Post and page thumbnails work the same way. These are used by [Open Graph](https
 
 Here's an example of what a tweet to your site could look like if you activate Twitter Cards and include all the metas in your post's YAML.
 
-![Twitter Card summary large image screenshot]({{ site.url }}/images/twitter-card-summary-large-image.jpg)
+![Twitter Card summary large image screenshot]({{ "/images/twitter-card-summary-large-image.jpg" | prepend: site.baseurl }})
 
 ### Videos
 
@@ -325,7 +324,7 @@ Twitter cards make it possible to attach images and post summaries to Tweets tha
 
 ### Link Post Type
 
-Link blog like a champ by adding `link: http://url-you-want-linked` to a post's YAML front matter. Arrow glyph links to the post's permalink and the the `post-title` links to the source URL. Here's an [example of a link post]({{ site.url }}/sample-link-post/) if you need a visual.
+Link blog like a champ by adding `link: http://url-you-want-linked` to a post's YAML front matter. Arrow glyph links to the post's permalink and the the `post-title` links to the source URL. Here's an [example of a link post]({{ "/sample-link-post/" | prepend: site.baseurl }}) if you need a visual.
 
 ---
 
@@ -375,10 +374,4 @@ Having a problem getting something to work or want to know why I setup something
 
 ## License
 
-This theme is free and open source software, distributed under the [MIT License]({{ site.url }}/LICENSE) version 2 or later. So feel free to to modify this theme to suit your needs.
-
----
-
-[^1]: Used to generate absolute URLs in `feed.xml`, and for canonical URLs in `head.html`. Don't include a trailing `/` in your base url ie: http://mademistakes.com. When developing locally I suggest using http://localhost:4000 or whatever localhost you're using to properly load all theme stylesheets, scripts, and image assets. If you leave this variable blank all links will resolve correctly except those pointing to home.
-
-[^2]: If you're using GitHub Pages to host your site be aware that plugins are disabled. So you'll need to build your site locally and then manually deploy if you want to use this sweet plugin.
+This theme is free and open source software, distributed under the [MIT License]({{ "/LICENSE" | prepend: site.baseurl }}) version 2 or later. So feel free to to modify this theme to suit your needs.