diff --git a/content/posts/slowdive-reunion.md b/content/posts/slowdive-reunion.md
index 93adf5c..0423644 100644
--- a/content/posts/slowdive-reunion.md
+++ b/content/posts/slowdive-reunion.md
@@ -5,11 +5,7 @@ Category: Uncategorized
 Tags: music, reunions, slowdive
 Slug: slowdive-reunion
 
-[caption id="attachment\_5574" align="alignnone" width="570"][![cc-by
-Greg
-![slowdive]({filename}/images/slowdive.jpg)
-cc-by [Greg
-Neate](https://secure.flickr.com/photos/neate_photos/12528849325)[/caption]
+![cc-by [Greg Neate](https://secure.flickr.com/photos/neate_photos/12528849325)]({filename}/images/slowdive.jpg)
 
 Slowdive spielen gerade Reunion-Shows??? Und so sehr wünsche ich mir
 eine von diesen zu besuchen. Slowdive sind für mich ja immer noch die
diff --git a/content/posts/wikipedia-zero.md b/content/posts/wikipedia-zero.md
index 33bd72f..d6291df 100644
--- a/content/posts/wikipedia-zero.md
+++ b/content/posts/wikipedia-zero.md
@@ -5,11 +5,7 @@ Category: Uncategorized
 Tags: internetz, wikipedia
 Slug: wikipedia-zero
 
-[caption id="attachment\_5119" align="alignnone" width="625"][![cc-by-sa
-Akapoor
-![Wikipedia_Zero_Logo]({filename}/images/Wikipedia_Zero_Logo.jpg)
-cc-by-sa [Akapoor
-(WMF)](https://wikimediafoundation.org/wiki/File:Wikipedia_Zero_Logo.jpg)[/caption]
+![cc-by-sa [Akapoor (WMF)](https://wikimediafoundation.org/wiki/File:Wikipedia_Zero_Logo.jpg)]({filename}/images/Wikipedia_Zero_Logo.jpg)
 
 Das die deutsche Wikipedia ein Admin-Kleingarten-Wächter-Problem hat,
 ist nichts neues. Trotzdem ist es eins dieser Projekte die das
diff --git a/content/posts/xkcd-und-john-cage.md b/content/posts/xkcd-und-john-cage.md
index 02eca78..992b1e4 100644
--- a/content/posts/xkcd-und-john-cage.md
+++ b/content/posts/xkcd-und-john-cage.md
@@ -5,9 +5,8 @@ Category: Uncategorized
 Tags: art, johncage, xkcd
 Slug: xkcd-und-john-cage
 
-[caption id="attachment\_4396" align="alignnone" width="712"][![cc-by-nc
-![silence]({filename}/images/silence.png)
-cc-by-nc [XKCD](http://xkcd.com/1199/)[/caption]
+
+![cc-by-nc [XKCD](http://xkcd.com/1199/)]({filename}/images/silence.png)
 
 XKCD widmetseinen heutigen Strip einer meiner liebsten Kunstarbeiten.
 [4′33″](https://de.wikipedia.org/wiki/4%E2%80%B233%E2%80%B3) von John
diff --git a/pelicanconf.py b/pelicanconf.py
index 95d0ac6..84240a7 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -21,9 +21,11 @@ LOCALE = "C"
 DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
 
-#FEED_ALL_ATOM = 'feeds/all.atom.xml'
-FEED_ALL_ATOM = 'feed/index.html'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+FEED_DOMAIN = SITEURL
+FEED_MAX_ITEMS = 50
+FEED_ALL_ATOM = 'feeds/all.atom.xml'
+FEED_ATOM = 'feed/index.html'
+#CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
 
 # global metadata to all the contents
 #DEFAULT_METADATA = (('yeah', 'it is'),)
diff --git a/themes/xsteadfastx-greg/static/css/simply.css b/themes/xsteadfastx-greg/static/css/simply.css
index 875e464..c8ceaa4 100644
--- a/themes/xsteadfastx-greg/static/css/simply.css
+++ b/themes/xsteadfastx-greg/static/css/simply.css
@@ -42,6 +42,7 @@ section#content {
 	margin-top: 30px 0;
 	float: right;
 }
+
 #content img {
 	display: block;
 	margin-left: auto;
@@ -49,6 +50,13 @@ section#content {
 	max-width: 90%;
 }
 
+#content figcaption {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 90%;
+	font-size: small;
+}
 
 /*SIDEBAR*/
 #sidebar {
diff --git a/themes/xsteadfastx-greg/templates/article.html b/themes/xsteadfastx-greg/templates/article.html
index 65adca6..abb261c 100644
--- a/themes/xsteadfastx-greg/templates/article.html
+++ b/themes/xsteadfastx-greg/templates/article.html
@@ -74,4 +74,16 @@
 				$(".videobox").fitVids();
 			});
 		</script>
+
+		<!-- image captions -->
+		<script>
+			$(document).ready(function() {
+				$("#content img").each(function() {
+			    if($(this).attr("alt"))
+						$(this).wrap('<figure class="image"></figure>')
+							.after('<figcaption>'+$(this).attr("alt")+'</figcaption>');
+				});
+			});
+		</script>
+
 {% endblock %}
diff --git a/themes/xsteadfastx-greg/templates/base.html b/themes/xsteadfastx-greg/templates/base.html
index 011f081..85cdb34 100644
--- a/themes/xsteadfastx-greg/templates/base.html
+++ b/themes/xsteadfastx-greg/templates/base.html
@@ -17,8 +17,8 @@
 
   <!-- Feeds
   ================================================== --> 
-  {% if FEED_ALL_ATOM %}
-  <link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" title="{{ SITENAME }} Full Atom Feed">
+  {% if FEED_ATOM %}
+  <link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" title="{{ SITENAME }} Full Feed">
   {% endif %}
 
 	<!-- Facebook Open Graph
@@ -79,7 +79,7 @@
 		{% if GITHUB_URL %}
 		<a class="icon" href="{{ GITHUB_URL }}" title="GitHub"><i class="icon-github"></i></a>
 		{% endif %}
-    		<a class="icon" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" title="Subscribe (Atom)"><i class="icon-rss"></i></a>
+    		<a class="icon" href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" title="Subscribe (Atom)"><i class="icon-rss"></i></a>
     	</div> <!-- social -->
       <!-- <hr class="small" />
       <div class="nav">
@@ -101,25 +101,6 @@
 		
 	</div><!-- container -->
 
-<!-- Google Analytics -->
-	{% include "analytics.html" %}
-
-  <script type="text/javascript">
-    $("a").on('click', function(e) {
-      var url = $(this).attr("href");
-      if (e.currentTarget.host != window.location.host) {
-        _gaq.push(['_trackEvent', 'Outbound Links', e.currentTarget.host, url, 0]);
-        if (e.metaKey || e.ctrlKey) {
-          var newtab = true;
-        }
-        if (!newtab) {
-          e.preventDefault();
-          setTimeout('document.location = "' + url + '"', 100);
-        }
-      }
-    });
-  </script>
-
 <!-- End Document
 ================================================== -->
 </body>