diff --git a/CHANGELOG.md b/CHANGELOG.md
index d22e85c3..6bcd035a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [4.0.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.5)
+
+### Enhancements
+
+- Update gems: `jekyll-sitemap` (0.12), `jekyll-feed` (0.8).
+- Improve next/previous pager links visibility by changing gray color to blue (`$link-color`).
+
+### Bug Fixes
+
+- Fix `.sidebar` flicker/jump when hovered. [#583](https://github.com/mmistakes/minimal-mistakes/issues/583)
+
+### Maintenance
+
+- Move contents of `gh-pages` branch to `master` inside of the `/docs` folder.
+
 ## [4.0.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.4)
 
 ### Enhancements
diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html
index 1d23b6f2..1d772381 100644
--- a/_includes/comments-providers/discourse.html
+++ b/_includes/comments-providers/discourse.html
@@ -1,6 +1,5 @@
 {% if site.comments.discourse.server %}
-{% include base_path %}
-{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+{% capture canonical %}{% if site.permalink contains '.html' %}{{ page.url | absolute_url }}{% else %}{{ page.url | absolute_url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
 <script type="text/javascript">
     DiscourseEmbed = { discourseUrl: '//{{ site.comments.discourse.server }}/',
                        discourseEmbedUrl: '{{ canonical }}' };
diff --git a/_includes/paginator.html b/_includes/paginator.html
index 588c0fd2..b6bf99a2 100644
--- a/_includes/paginator.html
+++ b/_includes/paginator.html
@@ -54,12 +54,12 @@
     {% if paginator.page == paginator.total_pages %}
       <li><a href="#" class="disabled current">{{ paginator.page }}</a></li>
     {% else %}
-      <li><a href="{{ base_path }}/page{{ paginator.total_pages }}/">{{ paginator.total_pages }}</a></li>
+      <li><a href="{{ '/page' | absolute_url }}{{ paginator.total_pages }}/">{{ paginator.total_pages }}</a></li>
     {% endif %}
 
     {% comment %} Link next page {% endcomment %}
     {% if paginator.next_page %}
-      <li><a href="{{ base_path }}/page{{ paginator.next_page }}/">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
+      <li><a href="{{ '/page' | absolute_url }}{{ paginator.next_page }}/">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
     {% else %}
       <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
     {% endif %}
diff --git a/_layouts/home.html b/_layouts/home.html
index 2db6526b..bcce92ab 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -2,8 +2,6 @@
 layout: archive
 ---
 
-{% include base_path %}
-
 <h3 class="archive__subtitle">{{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}</h3>
 
 {% for post in paginator.posts %}
diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md
index 47cc6059..dc1512da 100644
--- a/docs/_docs/18-history.md
+++ b/docs/_docs/18-history.md
@@ -4,9 +4,24 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-modified: 2016-11-03T09:49:02-04:00
+modified: 2016-11-04T12:36:05-04:00
 ---
 
+## [4.0.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.5)
+
+### Enhancements
+
+- Update gems: `jekyll-sitemap` (0.12), `jekyll-feed` (0.8).
+- Improve next/previous pager links visibility by changing gray color to blue (`$link-color`).
+
+### Bug Fixes
+
+- Fix `.sidebar` flicker/jump when hovered. [#583](https://github.com/mmistakes/minimal-mistakes/issues/583)
+
+### Maintenance
+
+- Move contents of `gh-pages` branch to `master` inside of the `/docs` folder.
+
 ## [4.0.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.4)
 
 ### Enhancements
diff --git a/docs/_includes/comments-providers/discourse.html b/docs/_includes/comments-providers/discourse.html
index 1d23b6f2..1d772381 100644
--- a/docs/_includes/comments-providers/discourse.html
+++ b/docs/_includes/comments-providers/discourse.html
@@ -1,6 +1,5 @@
 {% if site.comments.discourse.server %}
-{% include base_path %}
-{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+{% capture canonical %}{% if site.permalink contains '.html' %}{{ page.url | absolute_url }}{% else %}{{ page.url | absolute_url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
 <script type="text/javascript">
     DiscourseEmbed = { discourseUrl: '//{{ site.comments.discourse.server }}/',
                        discourseEmbedUrl: '{{ canonical }}' };
diff --git a/docs/_includes/paginator.html b/docs/_includes/paginator.html
index 588c0fd2..b6bf99a2 100644
--- a/docs/_includes/paginator.html
+++ b/docs/_includes/paginator.html
@@ -54,12 +54,12 @@
     {% if paginator.page == paginator.total_pages %}
       <li><a href="#" class="disabled current">{{ paginator.page }}</a></li>
     {% else %}
-      <li><a href="{{ base_path }}/page{{ paginator.total_pages }}/">{{ paginator.total_pages }}</a></li>
+      <li><a href="{{ '/page' | absolute_url }}{{ paginator.total_pages }}/">{{ paginator.total_pages }}</a></li>
     {% endif %}
 
     {% comment %} Link next page {% endcomment %}
     {% if paginator.next_page %}
-      <li><a href="{{ base_path }}/page{{ paginator.next_page }}/">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
+      <li><a href="{{ '/page' | absolute_url }}{{ paginator.next_page }}/">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
     {% else %}
       <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
     {% endif %}
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index 2db6526b..bcce92ab 100644
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -2,8 +2,6 @@
 layout: archive
 ---
 
-{% include base_path %}
-
 <h3 class="archive__subtitle">{{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}</h3>
 
 {% for post in paginator.posts %}
diff --git a/docs/_pages/archive-layout-with-content.md b/docs/_pages/archive-layout-with-content.md
index c99ca8ef..6c9b7376 100644
--- a/docs/_pages/archive-layout-with-content.md
+++ b/docs/_pages/archive-layout-with-content.md
@@ -213,7 +213,6 @@ Still sticking with science and Isaac Newton's E = MC<sup>2</sup>, which should
 
 This allows you to denote <var>variables</var>.
 
-{% include base_path %}
 {% for post in site.pages %}
 {% include archive-single.html %}
 {% endfor %}
\ No newline at end of file
diff --git a/docs/_pages/home.md b/docs/_pages/home.md
index 8ca03502..fee47dcc 100644
--- a/docs/_pages/home.md
+++ b/docs/_pages/home.md
@@ -7,7 +7,7 @@ header:
   cta_label: "<i class='fa fa-download'></i> Install Now"
   cta_url: "/docs/quick-start-guide/"
   caption:
-excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.4">Latest release v4.0.4</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
+excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.5">Latest release v4.0.5</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
 feature_row:
   - image_path: /assets/images/mm-customizable-feature.png
     alt: "customizable"
diff --git a/docs/_pages/sitemap.md b/docs/_pages/sitemap.md
index ebdd4053..2f1417d0 100644
--- a/docs/_pages/sitemap.md
+++ b/docs/_pages/sitemap.md
@@ -5,7 +5,7 @@ permalink: /sitemap/
 author_profile: false
 ---
 
-A list of all the posts and pages found on the site. For you robots out there is an [XML version]({{ base_path }}/sitemap.xml) available for digesting as well.
+A list of all the posts and pages found on the site. For you robots out there is an [XML version]({{ "sitemap.xml" | absolute_url }}) available for digesting as well.
 
 <h2>Pages</h2>
 {% for post in site.pages %}
diff --git a/docs/_posts/2010-08-07-post-image-caption.md b/docs/_posts/2010-08-07-post-image-caption.md
index 227f7ece..0f67dda1 100644
--- a/docs/_posts/2010-08-07-post-image-caption.md
+++ b/docs/_posts/2010-08-07-post-image-caption.md
@@ -7,10 +7,8 @@ tags:
   - Post Formats
 ---
 
-{% include base_path %}
-
 {% capture fig_img %}
-![Foo]({{ basepath }}/assets/images/unsplash-gallery-image-3.jpg)
+![Foo]({{ "/assets/images/unsplash-gallery-image-3.jpg" | absolute_url }})
 {% endcapture %}
 
 <figure>
diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec
index f6207090..858d6b0d 100644
--- a/minimal-mistakes-jekyll.gemspec
+++ b/minimal-mistakes-jekyll.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                    = "minimal-mistakes-jekyll"
-  spec.version                 = "4.0.4"
+  spec.version                 = "4.0.5"
   spec.authors                 = ["Michael Rose"]
 
   spec.summary                 = %q{A flexible two-column Jekyll theme.}
diff --git a/package.json b/package.json
index f9ff47c6..963e5e65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minimal-mistakes",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",