23 files changed, 152 insertions, 104 deletions

diff --git a/blog/2015/hello-world.rst b/blog/2015/hello-world.rst
index ce70a17..b93fb4e 100644
--- a/blog/2015/hello-world.rst
+++ b/blog/2015/hello-world.rst
@@ -6,9 +6,10 @@ Colorizing countries I have visited and can remember :)
 This is just to demonstrate my new static blog and web engine nikola
 
 .. chart:: maps.world.World
+   :title: "Reise"
    :stroke: False
    :style: RotateStyle('#de3804', step=12, background='#fff', plot_background='#fff', foreground='#eee' )
-   :js: ''
+   :js: ['']
 
    'Trip', ['nz', 'au', 'ar', 'cz', 'th', 'cu', 'rw', 'ch', 'pl', 'ma', 'se', 'fi', 'is', 'ee', 'nl', 'it' ]
    'Transit', [ 'ae', 'cn', 'ru', 'nc', 'br', 'si' ]
diff --git a/blog/2015/write-the-flogging-manual.rst b/blog/2015/write-the-flogging-manual.rst
index 278eb9f..f887478 100644
--- a/blog/2015/write-the-flogging-manual.rst
+++ b/blog/2015/write-the-flogging-manual.rst
@@ -1,7 +1,11 @@
 .. date: 2015/03/15 18:00
 .. title: Write the flogging manual
 
-More than thirteen years ago I set up my personal website. Proudly aligning everything with tables, hand writing HTML with :del:`pico` vi, using "clever" apache server side includes to inherit styles from parent directories and making everything so artsy bordering unreadability. And while in the beginning writing in HTML seemed fun, in the end it became so tedious, that updating the blog came to a grinding halt (we're all not getting younger).
+More than thirteen years ago I set up my personal website. Proudly aligning everything with tables, hand writing HTML with
+.. raw:: html
+<del><code>pico</code></del>
+
+ vi, using "clever" apache server side includes to inherit styles from parent directories and making everything so artsy bordering unreadability. And while in the beginning writing in HTML seemed fun, in the end it became so tedious, that updating the blog came to a grinding halt (we're all not getting younger).
 
 So in order to be able to publish again, I needed something more seasonable, with a responsive theme and simple enough to last another thirteen years. But my site accumulated so much cruft others depended on, replacing the apache alone with something more modern seemed unfeasible. Yet, my rather static content would best be served as static files by a *simple* web server – using an insecure scripting language on top of a complex database setup was completely out of the question. I once went through the pain of setting up and maintaining a wordpress site for my dad, there's no need to repeat that agony for something I'd like to use on a daily basis.
 
diff --git a/files/arts/software/opentracker/opentracker-1.0.tar.bz2 b/files/arts/software/opentracker/opentracker-1.0.tar.bz2
new file mode 100644
index 0000000..356a51a
--- /dev/null
+++ b/files/arts/software/opentracker/opentracker-1.0.tar.bz2
diff --git a/stories/index.rst b/stories/index.rst
index f0b86a3..ec01227 100644
--- a/stories/index.rst
+++ b/stories/index.rst
@@ -25,7 +25,7 @@ Software projects
 =================
 
 .. post-list::
-    :all:
+    :post_type: all
     :tags: project
     :template: list_projects.tmpl
     :id: projects
diff --git a/stories/music/Sven.rst b/stories/music/Sven.rst
index d762be0..2689c71 100644
--- a/stories/music/Sven.rst
+++ b/stories/music/Sven.rst
@@ -3,7 +3,7 @@
 .. tags: Liedermacher
 .. date: 1996/08/03 19:10:08
 .. title: Sven
-.. slug: ../arts/music/Sven
+.. slug: ../arts/music/Sven/index.html
 
 .. role:: raw-html(raw)
    :format: html
diff --git a/stories/music/index.rst b/stories/music/index.rst
index 2d46eda..dd950b2 100644
--- a/stories/music/index.rst
+++ b/stories/music/index.rst
@@ -14,7 +14,7 @@ Liedermacher
 ============
 
 .. post-list::
-    :all:
+    :post_type: all
     :tags: Liedermacher
     :id: singersongwriter
     :template: list_poetry.tmpl
@@ -29,7 +29,7 @@ Punk Rocker
 A short and wild detour through amplified guitars. The band was `pumpanickle <http://pumpanickle.de>`_ and we even had a `music video <../arts/music/From_Me_To_You.html>`_.
 
 .. post-list::
-    :all:
+    :post_type: all
     :tags: pumpanickle
     :id: band
     :template: list_poetry.tmpl
diff --git a/stories/poetry/index.rst b/stories/poetry/index.rst
index 8c3c125..3f0026d 100644
--- a/stories/poetry/index.rst
+++ b/stories/poetry/index.rst
@@ -7,7 +7,7 @@
 .. hidetitle:
 
 .. post-list::
-    :all:
+    :post_type: all
     :tags: poetry
     :template: list_poetry.tmpl
     :id: poetry
diff --git a/stories/projects/Telefonbuch.rst b/stories/projects/Telefonbuch.rst
index c672da0..e3a7a66 100644
--- a/stories/projects/Telefonbuch.rst
+++ b/stories/projects/Telefonbuch.rst
@@ -3,7 +3,7 @@
 .. tags: project
 .. date: 2015/02/01 19:10:08
 .. title: Telefonbuch
-.. slug: ../arts/software/Telefonbuch/index
+.. slug: ../arts/software/Telefonbuch
 .. prio: 98
 
 Die Deutsche Telekom bringt seit 1992 im praktischen CD- und später DVD-Format das Verzeichnis aller Fernsprechteilnehmer heraus. Über die Genese des Projekts, diese Daten zu exportieren, gibt es `einen Blogpost </posts/2008/datenmessie.html>`_  und zu den Innerein der vier verschiedenen Datenformate auf den CDs `ein wenig technische Dokumentation </gitweb/Telefonbuch/tree/README>`_.
diff --git a/stories/projects/anonbox.rst b/stories/projects/anonbox.rst
index 404ddbb..51e08e3 100644
--- a/stories/projects/anonbox.rst
+++ b/stories/projects/anonbox.rst
@@ -3,5 +3,5 @@
 .. tags: project
 .. date: 2015/02/01 19:10:08
 .. title: anonbox
-.. slug: ../arts/software/anonbox/index
+.. slug: ../arts/software/anonbox
 .. prio: 99
diff --git a/stories/projects/el.rst b/stories/projects/el.rst
index 8633181..a538f4d 100644
--- a/stories/projects/el.rst
+++ b/stories/projects/el.rst
@@ -4,7 +4,7 @@
 .. date: 2015/02/01 19:10:08
 .. title: el
 .. subtitle: extract lines from text files
-.. slug: ../arts/software/el/index
+.. slug: ../arts/software/el
 .. prio: 100
 
 .. contents::
diff --git a/stories/projects/elektropost.rst b/stories/projects/elektropost.rst
index 1a04345..cedd7f7 100644
--- a/stories/projects/elektropost.rst
+++ b/stories/projects/elektropost.rst
@@ -4,7 +4,7 @@
 .. date: 2014/02/01 19:10:08
 .. title: elektropost
 .. subtitle: a FreeBSD jail based mail server project.
-.. slug: ../arts/software/elektropost/index
+.. slug: ../arts/software/elektropost
 .. prio: 750
 
 .. contents::
@@ -70,7 +70,7 @@ Install dovecot
 ===============
 
 * ``make install`` in /usr/ports/mail/dovecot
-* choose option VPOPMAIL, keep the rest (maybe disable IPV6)
+* choose option LUA, keep the rest (maybe disable IPV6)
 * ``echo 'dovecot_enable="YES"' >> /etc/rc.conf``
 
 ----
@@ -78,7 +78,7 @@ Install dovecot
 Configure dovecot
 =================
 
-* ``cp /usr/local/etc/dovecot-example.conf /usr/local/etc/dovecot.conf``
+* ``cp /usr/local/etc/dovecot/dovecot-example.conf /usr/local/etc/dovecot/dovecot.conf``
 * Change: protocols = imap imaps pop3s
 * Change: listen = and ssl_listen = to match your ip addresses
 * Change: ssl_cert_file = /var/qmail/control/servercert.pem
@@ -88,9 +88,43 @@ Configure dovecot
 * Change: first_valid_gid = 1
 * Change: max_mail_processes = 1024
 * Change: auth_username_format = %Ln@%Ld
-* Change: #passdb pam { and #} if you do not have local user mail
-* Change: #userdb passwd { and #} if you do not have local user mail
-* Change: userdb vpopmail { and } to use vpopmail's vchkpw
+* Change::
+
+    passdb {
+        driver = lua
+        args = file=/usr/local/etc/dovecot/auth.lua blocking=yes # default is yes
+    }
+    userdb {
+        driver = lua
+        args = file=/usr/local/etc/dovecot/auth.lua blocking=yes # default is yes
+        }
+
+Install the file http://erdgeist.org/arts/software/Code/elektropost/auth.lua in ``/usr/local/etc/dovecot/``,
+
+.. code-block::
+
+    function auth_password_verify(req, pass)
+     local handle = io.popen("/usr/local/vpopmail/bin/vuserinfo -p "..req.user)
+     local result = handle:read("*a")
+     handle:close()
+
+     local epass = result:match "^%s*(.-)%s*$"
+     if req:password_verify("{MD5-CRYPT}"..epass,pass) > 0 then
+       return dovecot.auth.PASSDB_RESULT_OK, {}
+     end
+     return dovecot.auth.PASSDB_RESULT_PASSWORD_MISMATCH, {}
+    end
+
+    function auth_userdb_lookup(req)
+     local handle = io.popen("/usr/local/vpopmail/bin/vuserinfo -d "..req.user)
+     local result = handle:read("*a")
+     handle:close()
+
+     if result:find("no such user") ~= nil then
+      return dovecot.auth.USERDB_RESULT_USER_UNKNOWN, "no such user"
+     end
+     return dovecot.auth.USERDB_RESULT_OK, "uid=vpopmail gid=vchkpw home="..result:match "^%s*(.-)%s*$"
+    end
 
 ----
 
diff --git a/stories/projects/etherpad.rst b/stories/projects/etherpad.rst
index cc75def..aae7364 100644
--- a/stories/projects/etherpad.rst
+++ b/stories/projects/etherpad.rst
@@ -3,7 +3,7 @@
 .. tags: project
 .. date: 2015/02/01 19:10:08
 .. title: etherpad
-.. slug: ../arts/software/etherpad/index
+.. slug: ../arts/software/etherpad
 
 .. contents::
   :depth: 1
diff --git a/stories/projects/ezjail.rst b/stories/projects/ezjail.rst
index 955baa6..c4494a2 100644
--- a/stories/projects/ezjail.rst
+++ b/stories/projects/ezjail.rst
@@ -4,7 +4,7 @@
 .. date: 2000/02/01 19:10:08
 .. title: ezjail
 .. subtitle: Jail administration framework
-.. slug: ../arts/software/ezjail/index
+.. slug: ../arts/software/ezjail
 .. prio: 900
 
 .. contents::
@@ -27,8 +27,8 @@ News
 
 .. post-list::
     :tags: ezjail
-    :template: list_projectnews.tmpl
     :stop: 5
+    :template: list_projectnews.tmpl
 
 ----
 
diff --git a/stories/projects/jaildaemon.rst b/stories/projects/jaildaemon.rst
index cc818e3..e49a281 100644
--- a/stories/projects/jaildaemon.rst
+++ b/stories/projects/jaildaemon.rst
@@ -3,7 +3,7 @@
 .. date: 2015/02/18 19:10:08
 .. title: jaildaemon
 .. subtitle: A fixed command-line interface for FreeBSD jails to their host system
-.. slug: ../arts/software/jaildaemon/index
+.. slug: ../arts/software/jaildaemon
 .. prio: 850
 
 .. contents::
@@ -63,6 +63,18 @@ Now, from within that Jail, reboot via ``pkill -HUP -f REBOOT``.
 Version history
 ===============
 
+* Version 0.5:
+
+  * Fix the IPC packet size to match with system's net.local.dgram.maxdgram, which defaults to 2048
+
+* Version 0.4:
+
+  * Fix a bug where proctitle length was not parsed from the correct field
+
+* Version 0.3:
+
+  * Add a -g switch to allow *jaildaemon* to be passed a gid.
+
 * Version 0.2:
 
   * Fixed a bug where *jaildaemon* when run from /etc/rc would ignore SIGHUP by default.
diff --git a/stories/projects/minimunin.rst b/stories/projects/minimunin.rst
index 07cc2ff..07a4a56 100644
--- a/stories/projects/minimunin.rst
+++ b/stories/projects/minimunin.rst
@@ -4,7 +4,7 @@
 .. date: 2015/02/01 19:10:08
 .. title: minimunin
 .. subtitle: A tiny munin-node implementation for FreeBSD written in pure bourne shell providing basic plugin support
-.. slug: ../arts/software/minimunin/index
+.. slug: ../arts/software/minimunin
 .. prio: 800
 
 .. contents::
@@ -29,7 +29,7 @@ Code
 .. image:: http://www.freebsd.org/gifs/daemon_hammer-tn25.jpg
   :align: right
 
-You can always get the latest version of *minimunin*, use ``git clone git://erdgeist.org/minimunin`` or the legacy view ``cvs -d :pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot co minimunin`` with an empty password to check it out. There is a `minimunin tarball <minimunin-0.5.tar.bz2>`_. You can scroll through the source at `minimunin gitweb </gitweb/minimunin>`_ or `minimunin cvsweb (deprecated) </cvsweb/minimunin>`_. Typing ``make install`` installs the binary in your ``${PREFIX}/bin`` (or ``/usr/local``, if none is set).
+You can always get the latest version of *minimunin*, use ``git clone git://erdgeist.org/minimunin`` or the legacy view ``cvs -d :pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot co minimunin`` with an empty password to check it out. There is a `minimunin tarball <minimunin-0.6.tar.bz2>`_. You can scroll through the source at `minimunin gitweb </gitweb/minimunin>`_ or `minimunin cvsweb (deprecated) </cvsweb/minimunin>`_. Typing ``make install`` installs the binary in your ``${PREFIX}/bin`` (or ``/usr/local``, if none is set).
 
 ----
 
@@ -62,6 +62,12 @@ munin plugins `can be configured with ini-file style config files <http://munin-
 Version history
 ===============
 
+* V0.6 `minimunin-0.6.tar.bz2 <minimunin-0.6.tar.bz2>`_ (2024-12-08)
+
+  * Add a ``cap`` and ``version`` command.
+  * Use two digit precision for uptime.
+  * Fix `user` and `command` inside a plugin config section taken from a previous section.
+
 * V0.5 `minimunin-0.5.tar.bz2 <minimunin-0.5.tar.bz2>`_ (2019-09-11)
 
   * Fix broken plugin list. Thanks to Alexander Moisseev.
diff --git a/stories/projects/opentracker.rst b/stories/projects/opentracker.rst
index d269fca..11005cb 100644
--- a/stories/projects/opentracker.rst
+++ b/stories/projects/opentracker.rst
@@ -4,7 +4,7 @@
 .. date: 2015/02/19 19:10:08
 .. title: opentracker
 .. subtitle: An open and free bittorrent tracker
-.. slug: ../arts/software/opentracker/index
+.. slug: ../arts/software/opentracker
 .. prio: 1000
 
 .. contents::
@@ -26,14 +26,28 @@
 Overview
 ========
 
-*opentracker* is a open and free `bittorrent tracker <http://wiki.theory.org/BitTorrentSpecification>`_ project. It aims for minimal resource usage and is intended to run at your wlan router. Currently it is deployed as an open and free tracker instance. Read our `free and open tracker blog <http://opentracker.blog.h3q.com/>`_ and announce your torrents there (but do not hesitate to setup your own free trackers!).
+*opentracker* is an open and free `bittorrent tracker <http://wiki.theory.org/BitTorrentSpecification>`_ project. It aims for minimal resource usage and is intended to run at your wlan router. Currently it is deployed as an open and free tracker instance. Read our `free and open tracker blog <http://opentracker.blog.h3q.com/>`_ and announce your torrents there (but do not hesitate to setup your own free trackers!).
 
 ----
 
 Version History
 ===============
 
-*opentracker* is currently only available from CVS. A tar ball will be rolled soon. Use ``git clone git://erdgeist.org/opentracker`` or the legacy view ``cvs -d :pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot co opentracker`` with an empty passwort to check it out. An `*opentracker* gitweb </gitweb/opentracker/>`_ and an `*opentracker* cvsweb (deprecated) </cvsweb/opentracker/>`_ are available.
+Use ``git clone git://erdgeist.org/opentracker`` to check it out. An *opentracker* `gitweb </gitweb/opentracker/>`_ is available.
+
+* CURRENT - not packaged yet
+* V1.0 `<opentracker-1.0.tar.bz2>`_ (2025-01-01)
+
+  * After 18 years of development, a v1.0 was released.
+  * It requires libowfat version >= 0.34.
+  * Since April 2024, opentracker supports IPv4 and IPv6 peers in a single tracker.
+
+    * With TCP announces, both IPv4 and IPv6 peers will now be returned.
+  * Proxy addresses can be networks in CIDR notation now.
+  * For trackers with many insertions and deletions in black/white lists, dynamic access lists were introduced, with fifo allowing to add or delete torrents.
+  * Full scrapes and other data intense queries are now delivered using chunked http transfers, allowing generating them on the fly, saving a lot of memory. Also they are compressed by default now.
+  * UDP replies on the IPv6 side are now limited to amounts of peers that will not cause fragmentation on most routers.
+  * Better prevent expensive stats operations to be triggered by accident. Some torrents included a stats URL as announce URL.
 
 ----
 
@@ -46,7 +60,6 @@ Until *opentracker* is declared official release ready, the way to install it is
   cd libowfat
   make
   cd ..
-  # LEGACY: cvs -d:pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot co opentracker
   git clone git://erdgeist.org/opentracker
   cd opentracker
   make
@@ -55,8 +68,10 @@ That should leave you with an exectuable called ``opentracker`` and one debug ve
 
 Some variables in *opentracker*'s Makefile control features and behaviour of *opentracker*. Here they are:
 
-* ``-DWANT_V6`` makes *opentracker* an IPv6-only tracker. More in the v6-section below.
-* *opentracker* can deliver gzip compressed full scrapes. Enable this with ``-DWANT_COMPRESSION_GZIP`` option.
+* ``-DWANT_V4_ONLY`` makes *opentracker* bind only on IPv4 addresses.
+* *opentracker* can deliver gzip compressed full scrapes. Enable this with ``-DWANT_COMPRESSION_GZIP`` option (this is the default).
+
+  * To make *opentracker* deliver gzip compressed full scrapes always, enable the ``-DWANT_COMPRESSION_GZIP_ALWAY`` option (this is the default).
 * Normally *opentracker* tracks any torrent announced to it. You can change that behaviour by enabling ONE of ``-DWANT_ACCESSLIST_BLACK`` or ``-DWANT_ACCESSLIST_WHITE``. Note, that you have to provide a whitelist file in order to make *opentracker* do anything in the latter case. More in the closed mode section below.
 * *opentracker* can run in a cluster. Enable this behaviour by enabling ``-DWANT_SYNC_LIVE``. Note, that you have to configure your cluster before you can use *opentracker* when this option is on.
 * Some statistics *opentracker* can provide are sensitive. You can restrict access to these statistics by enabling ``-DWANT_RESTRICT_STATS``. See section statistics for more details.
@@ -70,7 +85,7 @@ Some variables in *opentracker*'s Makefile control features and behaviour of *op
 Invocation
 ==========
 
-*opentracker* can be run by just typing ``./opentracker``. This will make *opentracker* bind to ``0.0.0.0:6969`` and happily serve all torrents presented to it. If ran as root, *opentracker* will immediately chroot to . (or any directory given with the -d option) and drop all priviliges after binding to whatever tcp or udp ports it is requested.
+*opentracker* can be run by just typing ``./opentracker``. This will make *opentracker* bind to ``0.0.0.0:6969`` and ``[::1]:6969`` and happily serve all torrents presented to it. If ran as root, *opentracker* will immediately chroot to . (or any directory given with the -d option) and drop all priviliges after binding to whatever tcp or udp ports it is requested.
 
 When options were few, *opentracker* used to accept all of them from command line. While this still is possible for most options, using them is quite unhandy: an example invocation would look like ``./opentracker -i 23.23.23.7 -p 80 -P 80 -p 6969 -i 23.23.23.8 -p 80 -r http://www.mytorrentsite.com/ -d /usr/local/etc/opentracker -w mytorrents.list -A 127.0.0.1``.
 
@@ -100,7 +115,7 @@ To make *opentracker* reload it's white/blacklist, send a ``SIGHUP`` unix signal
 Statistics
 ==========
 
-Given its very network centric approach, talking to *opentracker* via http comes very naturally. Besides the ``/announce`` and ``/scrape`` paths, there is a third path you can access the tracker by: ``/stats``. This request takes parameters, for a quick overview just inquire `/stats?mode=everything``.
+Given its very network centric approach, talking to *opentracker* via http comes very naturally. Besides the ``/announce`` and ``/scrape`` paths, there is a third path you can access the tracker by: ``/stats``. This request takes parameters, for a quick overview just inquire `/stats?mode=everything`.
 
 Statistics have grown over time and are currently not very tidied up. Most modes were written to dump legacy-SNMP-style blocks that can easily be monitored by `MRTG <http://oss.oetiker.ch/mrtg/>`_. These modes are: ``peer``, ``conn``, ``scrp``, ``udp4``, ``tcp4``, ``busy``, ``torr``, ``fscr``, ``completed``, ``syncs``. I'm not going to explain these here.
 
@@ -113,7 +128,7 @@ You can inquire *opentracker*'s version (i.e. CVS versions of all its objects) u
 Philosophy
 ==========
 
-A torrent tracker basically is an http-Server that collects all clients ip addresses into pools sorted by one of the request strings parameters and answers all other clients that specified this exact same parameter a list of all other recent clients. All technologies to implement this are around for more than twenty years. Still most implementations suck performancewise.
+A torrent tracker basically is an http server that collects all clients ip addresses into pools sorted by one of the request strings parameters and answers all other clients that specified this exact same parameter a list of all other recent clients. All technologies to implement this are around for more than twenty years. Still most implementations suck performancewise.
 
 Utilizing the highly scalable server framework from `libowfat <http://www.fefe.de/libowfat/>`_, *opentracker* can easily serve multiple thousands of requests on a standard plastic WLAN-router, limited only by your kernels capabilities ;)
 
diff --git a/stories/projects/timestretch.rst b/stories/projects/timestretch.rst
index 15ce5ca..30ec7c5 100644
--- a/stories/projects/timestretch.rst
+++ b/stories/projects/timestretch.rst
@@ -4,7 +4,7 @@
 .. date: 2015/02/01 19:10:08
 .. title: timestretch
 .. subtitle: a fast sample time stretching implementation
-.. slug: ../arts/software/timestretch/index
+.. slug: ../arts/software/timestretch
 
 .. contents::
   :depth: 1
diff --git a/stories/projects/vchat-client.rst b/stories/projects/vchat-client.rst
index f540f04..0d9f096 100644
--- a/stories/projects/vchat-client.rst
+++ b/stories/projects/vchat-client.rst
@@ -3,7 +3,7 @@
 .. tags: project
 .. date: 2014/02/01 19:10:08
 .. title: vchat-client
-.. slug: ../arts/software/vchat-client/index
+.. slug: ../arts/software/vchat-client
 
 Newbies Guide to vchat via 'Buntclient'
 =======================================
diff --git a/themes/erdgeist/templates/base.tmpl b/themes/erdgeist/templates/base.tmpl
index 3bdf48d..813b592 100644
--- a/themes/erdgeist/templates/base.tmpl
+++ b/themes/erdgeist/templates/base.tmpl
@@ -37,7 +37,7 @@ ${template_hooks['extra_head']()}
         </div>
         <!--End of body content-->
 
-        <footer>
+        <footer id="footer">
             ${content_footer}
             ${template_hooks['page_footer']()}
         </footer>
@@ -45,13 +45,20 @@ ${template_hooks['extra_head']()}
 </div>
 
 ${base.late_load_js()}
-    <!--script>$('a.image-reference:not(.islink)').colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script -->
+    <!-- fancy dates -->
+    <script>
+    moment.locale("${momentjs_locales[lang]}");
+    fancydates(${date_fanciness}, ${js_date_format});
+    </script>
+    <!-- end fancy dates -->
     <%block name="extra_js"></%block>
-    % if annotations and post and not post.meta('noannotations'):
-        ${notes.code()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.code()}
-    % endif
+    <script>
+    baguetteBox.run('div#content', {
+        ignoreClass: 'islink',
+        captions: function(element) {
+            return element.getElementsByTagName('img')[0].alt;
+    }});
+    </script>
 ${body_end}
 ${template_hooks['body_end']()}
 </body>
diff --git a/themes/erdgeist/templates/base_helper.tmpl b/themes/erdgeist/templates/base_helper.tmpl
index bec4b78..7b44a95 100644
--- a/themes/erdgeist/templates/base_helper.tmpl
+++ b/themes/erdgeist/templates/base_helper.tmpl
@@ -1,6 +1,7 @@
 ## -*- coding: utf-8 -*-
 
 <%namespace name="notes" file="annotation_helper.tmpl" import="*" />
+<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/>
 <%def name="html_headstart()">
 <!DOCTYPE html>
 <html
@@ -26,17 +27,26 @@ dir="rtl" \
 lang="${lang}">
     <head>
     <meta charset="utf-8">
+    % if use_base_tag:
+    <base href="${abs_link(permalink)}">
+    % endif
     %if description:
-    <meta name="description" content="${description}">
+    <meta name="description" content="${description|h}">
     %endif
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>${title|striphtml} | ${blog_title|striphtml}</title>
+    %if title == blog_title:
+        <title>${blog_title|h}</title>
+    %else:
+        <title>${title|h} | ${blog_title|h}</title>
+    %endif
 
     ${html_stylesheets()}
-    ${html_feedlinks()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
+    <meta name="theme-color" content="${theme_color}">
+    % if meta_generator_tag:
+    <meta name="generator" content="Nikola (getnikola.com)">
+    % endif
+    ${feeds_translations.head(classification=None, kind='index', other=False)}
+    <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons:
         %for name, file, size in favicons:
@@ -55,11 +65,10 @@ lang="${lang}">
         <link rel="next" href="${nextlink}" type="text/html">
     %endif
 
-    ${mathjax_config}
     %if use_cdn:
         <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
     %else:
-        <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang)}"></script><![endif]-->
+        <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang, url_type)}"></script><![endif]-->
     %endif
 
     ${extra_head_data}
@@ -81,13 +90,10 @@ lang="${lang}">
         %else:
             <script src="/assets/js/jquery.min.js"></script>
             <script src="/assets/js/bootstrap.min.js"></script>
-            <script src="/assets/js/moment-with-locales.min.js"></script>
-            <script src="/assets/js/fancydates.js"></script>
+            <script src="/assets/js/baguetteBox.min.js"></script>
         %endif
-        <script src="/assets/js/jquery.colorbox-min.js"></script>
-    %endif
-    %if colorbox_locales[lang]:
-        <script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script>
+        <script src="/assets/js/moment-with-locales.min.js"></script>
+        <script src="/assets/js/fancydates.min.js"></script>
     %endif
     ${social_buttons_code}
 </%def>
@@ -106,30 +112,30 @@ lang="${lang}">
             <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
         %else:
             <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
+            <link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
         %endif
-        <link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/rst_base.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/nikola_rst.css" rel="stylesheet" type="text/css">
         <link href="/assets/css/code.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
         <link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
         %if has_custom_css:
             <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         %endif
     %endif
-    % if annotations and post and not post.meta('noannotations'):
-        ${notes.css()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.css()}
-    % endif
+    %if needs_ipython_css:
+        <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css">
+    %endif
 </%def>
 
 <%def name="html_navigation_links()">
     %for url, text, icon in navigation_links[lang]:
         % if isinstance(url, tuple):
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text}<b class="caret"></b></a>
+            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a>
             <ul class="dropdown-menu">
             %for suburl, text in url:
                 % if rel_link(permalink, suburl) == "#":
-                    <li class="active"><a href="${permalink}" title="${text}"><i class="${icon}"></i></a>
+                    <li class="active"><a href="${permalink}">${text} <i class="${icon}"></i></a>
                 %else:
                     <li><a href="${suburl}" title="${text}"><i class="${icon}"></i></a>
                 %endif
@@ -146,21 +152,11 @@ lang="${lang}">
 </%def>
 
 <%def name="html_feedlinks()">
-    %if rss_link:
-        ${rss_link}
-    %elif generate_rss:
-        %if len(translations) > 1:
-            %for language in translations:
-                <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
-            %endfor
-        %else:
-            <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
-        %endif
-    %endif
+    ${feeds_translations.head(classification=None, kind='index', other=False)}
 </%def>
 
 <%def name="html_translations()">
-    %for langname in translations.keys():
+    %for langname in sorted(translations):
         %if langname != lang:
             <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
         %endif
diff --git a/themes/erdgeist/templates/index_helper.tmpl b/themes/erdgeist/templates/index_helper.tmpl
deleted file mode 100644
index 9331b93..0000000
--- a/themes/erdgeist/templates/index_helper.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-## -*- coding: utf-8 -*-
-<%def name="html_pager()">
-    %if prevlink or nextlink:
-        <nav class="postindexpager">
-        <ul class="pager">
-        %if prevlink:
-            <li class="previous">
-                <a href="${prevlink}" rel="prev">${messages("Newer posts")}</a>
-            </li>
-        %endif
-        %if nextlink:
-            <li class="next">
-                <a href="${nextlink}" rel="next">${messages("Older posts")}</a>
-            </li>
-        %endif
-        </ul>
-        </nav>
-    %endif
-</%def>
-
-<%def name="mathjax_script(posts)">
-    %if any(post.is_mathjax for post in posts):
-        <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script>
-        <script src="/assets/js/mathjax.js"></script>
-    %endif
-</%def>
diff --git a/themes/erdgeist/templates/list_poetry.tmpl b/themes/erdgeist/templates/list_poetry.tmpl
index 3bde503..d05ec96 100644
--- a/themes/erdgeist/templates/list_poetry.tmpl
+++ b/themes/erdgeist/templates/list_poetry.tmpl
@@ -6,7 +6,7 @@
     <ul class="poetry-list multi-columns post-list list-unstyled">
         % for post in posts:
             <li class="post-list-item">
-                <a href="${post.permalink()}">${post.title(lang)}</a><div class="post-date">(${post.formatted_date('%b %Y')})</div>
+                <a href="${post.permalink()}">${post.title(lang)}</a><div class="post-date">(${post.formatted_date('MMM Y')})</div>
            </li>
         % endfor
     </ul>
diff --git a/themes/erdgeist/templates/list_projectnews.tmpl b/themes/erdgeist/templates/list_projectnews.tmpl
index abb515b..8c6a9eb 100644
--- a/themes/erdgeist/templates/list_projectnews.tmpl
+++ b/themes/erdgeist/templates/list_projectnews.tmpl
@@ -6,7 +6,7 @@
     <ul class="poetry-list post-list list-unstyled">
         % for post in posts:
             <li class="post-list-item">
-                <div style="float:left; margin-right: .6em"><a href="${post.permalink()}">(${post.formatted_date('%Y-%m-%d')})</a></div> ${post.text(lang)}
+                <div style="float:left; margin-right: .6em"><a href="${post.permalink()}">(${post.formatted_date('Y-m-d')})</a></div> ${post.text(lang)}
            </li>
         % endfor
     </ul>