diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index e3ceae1..b512bc9 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,20 +1,35 @@
 <aside>
+        <div class="panel radius">
+            <h3>Categories</h3>
+            <ul>
+            {% for category in site.categories %}
+                <li>{% categorylink category[0] %}
+                        {% if category[0] == "kde" or category[0] == "s.t.e.a.l." %}
+                            {{ category[0] | upcase }}
+                        {% elsif category[0] contains "final fantasy" %}
+                            {{ category[0] | capitalize_all | replace:'Xi','XI' | replace:'v','V'}}
+                        {% else %}
+                            {{ category[0] | capitalize_all }}
+                        {% endif %}
+                    {% endcategorylink %}</li>
+            {% endfor %}
+            </ul>
+        </div>
 	<div class="panel radius">
-		<h3>Sidebar</h3>
-		<p>
-			Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-
-			Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-		</p>
+		<h3>Links</h3>
+		{% for link_cat in site.data.links %}
+                    <h6>{{ link_cat.name }}</h6>
+                    <ul>
+                        {% for link in link_cat.links %}
+                            <li><a href="{{ link.url }}" title="{{ link.name }}">{{ link.name }}</a></li>
+                        {% endfor %}
+                    </ul>
+                {% endfor %}
 	</div>
 
-  <img class="b30" src="http://dummyimage.com/303x16:9/df4949/e27b3f.png&amp;text=Ugly+Ad+Space" alt="">
-
-
-	<div class="border-dotted radius b30">
-		<img src="http://placekitten.com/271/270" alt="uh, Placekitten">
-		<p class="text-left">
-			This is an advertisment with a crazy cat! <a href="http://placekitten.com/">More cats, please!</a>
-		</p>
+	<div class="panel radius">
+		<h3>Recent comments</h3>
+		<p>TODO</p>
 	</div>
+
 </aside>
\ No newline at end of file