diff --git a/_config.yml b/_config.yml
index 93bf2914761..b93c45e7e8a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -69,7 +69,7 @@ titlecase: true       # Converts page and post titles to titlecase
 
 # list each of the sidebar modules you want to include, in the order you want them to appear.
 # To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
-default_asides: [post/sharing.html, asides/recent_posts.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+default_asides: [post/sharing.html, asides/recent_posts.html]
 
 # Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below
 # and add an array with the asides you want to use.
diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss
index 04caff49099..9a1a73a3c58 100644
--- a/sass/custom/_paulus.scss
+++ b/sass/custom/_paulus.scss
@@ -186,6 +186,10 @@ p.note {
 
 }
 
+#site-search .search {
+  width: calc(100% - 36px);
+}
+
 .install-instructions-container {
   #normal-install, #raspberry-install, #docker-install, .install-instructions {
     display: none;
diff --git a/source/_includes/asides/about.html b/source/_includes/asides/about.html
new file mode 100644
index 00000000000..fe95f143c5a
--- /dev/null
+++ b/source/_includes/asides/about.html
@@ -0,0 +1,11 @@
+<section class="aside-module grid__item one-whole lap-one-half">
+  <h1 class="title delta">About Home Assistant</h1>
+  <ul class="divided">
+    <li>
+      Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control.
+    </li>
+    <li><a href='/getting-started/'>Get started with Home Assistant</a></li>
+    <li><a href='/demo/'>Open the online demo</a></li>
+    <li><a href='https://github.com/balloob/home-assistant/'>Browse code on GitHub</a></li>
+  </ul>
+</section>
diff --git a/source/_includes/asides/categories.html b/source/_includes/asides/categories.html
new file mode 100644
index 00000000000..0e4518742d3
--- /dev/null
+++ b/source/_includes/asides/categories.html
@@ -0,0 +1,9 @@
+<section class="aside-module grid__item one-whole lap-one-half">
+  <h1 class="title delta">Categories</h1>
+  <ul class="divided">
+    {% assign categories = site.categories | sort %}
+    {% for category in categories %}
+      <li><a href="/blog/categories/{{ category | first }}/">{{ category | first | replace: '-', ' '}}</a></li>
+    {% endfor %}
+  </ul>
+</section>
diff --git a/source/_includes/asides/delicious.html b/source/_includes/asides/delicious.html
deleted file mode 100644
index b76f2623dd0..00000000000
--- a/source/_includes/asides/delicious.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% if site.delicious_user %}
-<section class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">
-    Delicious
-    <small class="pull-right">
-      <a class="btn" href="//delicious.com/{{ site.delicious_user }}" title="@{{ site.delicious_user }} on Delicious" target="_blank">
-        <i class="icon-external-link"></i>
-      </a>
-    </small>
-  </h1>
-  <div id="delicious">
-    <span class="loading">
-      <i class="icon-spinner icon-spin"></i>
-    </span>
-  </div>
-</section>
-{% endif %}
\ No newline at end of file
diff --git a/source/_includes/asides/googleplus.html b/source/_includes/asides/googleplus.html
deleted file mode 100644
index d24547941fb..00000000000
--- a/source/_includes/asides/googleplus.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% comment %}
-  This section intentionally blank.
-{% endcomment %}
\ No newline at end of file
diff --git a/source/_includes/asides/pinboard.html b/source/_includes/asides/pinboard.html
deleted file mode 100644
index 9c789debf02..00000000000
--- a/source/_includes/asides/pinboard.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% if site.pinboard_user %}
-<section id="pinboard" class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">
-    My Pinboard
-    <small class="pull-right">
-      <a class="btn" href="//pinboard.in/u:{{ site.pinboard_user }}" title="My Pinboard Bookmarks" target="_blank">
-        <i class="icon-external-link"></i>
-      </a>
-    </small>
-  </h1>
-  <ul class="divided" id="pinboard_linkroll">
-    <li class="loading">
-      <i class="icon-spinner icon-spin"></i>
-    </li>
-  </ul>
-</section>
-{% endif %}
diff --git a/source/_includes/asides/recent_posts.html b/source/_includes/asides/recent_posts.html
index c3c5e7d81a1..66628e6b925 100644
--- a/source/_includes/asides/recent_posts.html
+++ b/source/_includes/asides/recent_posts.html
@@ -1,5 +1,5 @@
 <section id="recent-posts" class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">Other Posts</h1>
+  <h1 class="title delta">Recent Posts</h1>
   <ul class="divided">
     {% for post in site.posts limit: site.recent_posts %}
       {% if post.url != page.url  %}
diff --git a/source/_includes/asides/search.html b/source/_includes/asides/search.html
new file mode 100644
index 00000000000..705879c1cd2
--- /dev/null
+++ b/source/_includes/asides/search.html
@@ -0,0 +1,7 @@
+<section id="site-search" class="aside-module grid__item one-whole lap-one-half">
+  <form action="{{ site.simple_search }}" method="get">
+    <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}" />
+    <input class="search" type="text" name="q" results="0" placeholder="Search home-assistant.io"/>
+    <button type="submit"><i class="icon-search"></i></button>
+  </form>
+</section>
diff --git a/source/_includes/custom/welcome.html b/source/_includes/custom/welcome.html
index d4d6aa18b44..a601d474d31 100644
--- a/source/_includes/custom/welcome.html
+++ b/source/_includes/custom/welcome.html
@@ -7,7 +7,7 @@ Home Assistant is an open-source home automation platform running on Python 3. T
 <div>hass --open-ui</div>
 </code>
 <p class='hero-buttons'>
-  <a href='{{ root_url }}/demo/' target='_blank'>View demo</a>
   <a href='{{ root_url }}/getting-started/'>Get started</a>
+  <a href='{{ root_url }}/demo/' target='_blank'>View demo</a>
   <a href='https://www.github.com/balloob/home-assistant'>Browse code on GitHub</a>
 </p>
diff --git a/source/_includes/site/sidebar.html b/source/_includes/site/sidebar.html
index 5cb593d902e..b78f23b65e5 100644
--- a/source/_includes/site/sidebar.html
+++ b/source/_includes/site/sidebar.html
@@ -3,7 +3,14 @@
   {% if url_parts[1] == 'components' %}
     {% include asides/component_navigation.html | compact_newlines %}
   {% else %}
-    {% include asides/social.html %}
-    {% include_array default_asides %}
+    {% include asides/search.html %}
+    {% include asides/about.html %}
+
+    {% if page.blog_index %}
+      {% include asides/categories.html %}
+    {% else %}
+      {% include asides/social.html %}
+      {% include_array default_asides %}
+    {% endif %}
   {% endif %}
 </div>