diff --git a/pelicanconf.py b/pelicanconf.py
index b156a7d..8913fdc 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -75,3 +75,7 @@ LOAD_CONTENT_CACHE = True
 # disable tags
 TAGS_SAVE_AS = ''
 TAG_SAVE_AS = ''
+
+# PIWIK
+PIWIK_URL = 'piwik.luftmentsh.org'
+PIWIK_SITE_ID = 5
diff --git a/themes/xsteadfastx-greg/templates/analytics.html b/themes/xsteadfastx-greg/templates/analytics.html
index c464f14..e27adf8 100644
--- a/themes/xsteadfastx-greg/templates/analytics.html
+++ b/themes/xsteadfastx-greg/templates/analytics.html
@@ -1,16 +1,46 @@
 {% if GOOGLE_ANALYTICS %}
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']);
-  _gaq.push(['_setDomainName', '{{ DOMAIN }}']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-{% endif %}
\ No newline at end of file
+    <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '{{GOOGLE_ANALYTICS}}']);
+    _gaq.push(['_trackPageview']);
+    (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+    </script>
+{% endif %}
+{% if GAUGES %}
+    <script type="text/javascript">
+    var _gauges = _gauges || [];
+    (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '{{GAUGES}}');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+    })();
+    </script>
+{% endif %}
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+    <script type="text/javascript">
+    {% if PIWIK_SSL_URL %}
+        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+    {% else %}
+        var pkBaseURL = "{{ PIWIK_URL }}";
+    {% endif %}
+    var _paq = _paq || [];
+    _paq.push(["trackPageView"]);
+    _paq.push(["enableLinkTracking"]);
+    (function() {
+        var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
+        _paq.push(["setTrackerUrl", u+"piwik.php"]);
+        _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+        var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+        g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+    })();
+    </script>
+{% endif %}
diff --git a/themes/xsteadfastx-greg/templates/base.html b/themes/xsteadfastx-greg/templates/base.html
index ab162d4..5f59a9e 100644
--- a/themes/xsteadfastx-greg/templates/base.html
+++ b/themes/xsteadfastx-greg/templates/base.html
@@ -75,7 +75,7 @@
 	<div class="container">
 		<section id="sidebar" class="two columns">
 			<a href="/"><img id="avatar" src="{{ AVATAR }}"></img></a>
-	    <hr class="small" /> 
+	    <hr class="small" />
     	<div id="social">
 		{% if TWITTER_NAME %}
 		<a class="icon" href="http://twitter.com/{{ TWITTER_NAME }}" title="Twitter"><i class="icon-twitter"></i></a>
@@ -102,9 +102,14 @@
 			<!-- <hr class="small"> -->
 			<p>Generated with <a href="http://getpelican.com">Pelican</a>. Layout done with <a href="http://getskeleton.com">Skeleton</a>. Icons are <a href="http://fortawesome.github.com/Font-Awesome/">Font Awesome</a>. Hosted on <a href="http://github.com">GitHub</a>. <a href="/pages/impressum.html">Impressum.</a></p>
 		</footer>
-		
+
 	</div><!-- container -->
 
+
+<!-- Include other templates
+=============================================== -->
+{% include 'analytics.html' %}
+
 <!-- End Document
 ================================================== -->
 </body>