diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index d3973383..c5b187be 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -102,7 +102,13 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
+pre {
+  display: block;
+  padding: 0.5em;
+  background: #002b36;
+  color: #D9E9EB;
+  margin-bottom: 1em;
+}
 
 /* Quotes */
 blockquote {
@@ -300,25 +306,39 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 
 #extras a:hover, #extras a:active {color: #fff;}
 
-	/* Blogroll */
-	#extras .blogroll {
-		float: left;
-		width: 615px;
+	/* Tags */
+	#extras .tags {
+		width: 800px;
 	}
 	
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	#extras .tags li {float: left; margin: 0 20px 0 0; width: 90px;}
+
+	/* Blogroll */
+	#extras .blogroll {
+		width: 550px;
+    margin-top: 2em;
+    float: left;
+	}
+	
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 90px;}
+
 	
 	/* Social */
 	#extras .social {
-		float: right;
-		width: 175px;
+		width: 150px;
+    margin-top: 2em;
+    float: left;
 	}
-	
+
 	#extras div[class='social'] a {
 		background-repeat: no-repeat;
 		background-position: 3px 6px;
 		padding-left: 25px;
 	}
+
+  #extras .social li {
+    margin-top: 0;
+  }
 	
 		/* Icons */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
diff --git a/pelican/themes/notmyidea/static/css/pygment.css b/pelican/themes/notmyidea/static/css/pygment.css
index fdd056f6..28039e6e 100644
--- a/pelican/themes/notmyidea/static/css/pygment.css
+++ b/pelican/themes/notmyidea/static/css/pygment.css
@@ -6,7 +6,9 @@ color:#408090;
 font-style:italic;
 }
 .err {
+/*
 border:1px solid #FF0000;
+*/
 }
 .k {
 color:#007020;
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 1c09a194..28111f12 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -39,9 +39,17 @@
         {% block content %}
         {% endblock %}
         <section id="extras" class="body">
+        <div class="tags">
+          <h2>Tags</h2>
+          <ul class="tagcloud">
+              {% for tag in tag_cloud %}
+                  <li class=""><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
+              {% endfor %}
+          </ul>
+        </div>
         {% if LINKS %}
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>Blogroll</h2>
                         <ul>
                         {% for name, link in LINKS %}
                             <li><a href="{{ link }}">{{ name }}</a></li>
@@ -51,18 +59,18 @@
         {% endif %}
         {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
                 <div class="social">
-                        <h2>social</h2>
+                        <h2>Social</h2>
                         <ul>
-                            {% if FEED_ALL_ATOM %}
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            {% endif %}
-                            {% if FEED_ALL_RSS %}
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            {% endif %}
+                          {% if FEED_ALL_ATOM %}
+                          <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                          {% endif %}
+                          {% if FEED_ALL_RSS %}
+                          <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                          {% endif %}
 
-                        {% for name, link in SOCIAL %}
-                            <li><a href="{{ link }}">{{ name }}</a></li>
-                        {% endfor %}
+                          {% for name, link in SOCIAL %}
+                          <li><a href="{{ link }}">{{ name }}</a></li>
+                          {% endfor %}
                         </ul>
                 </div><!-- /.social -->
         {% endif %}