diff --git a/prestatic/aesthetics.js b/prestatic/aesthetics.js
index 307299a..e3b97f1 100644
--- a/prestatic/aesthetics.js
+++ b/prestatic/aesthetics.js
@@ -22,7 +22,7 @@ get_window_size = function() {
 };
 
 is_screen_media = function() {
-    return (document.getElementsByTagName('link')[0].getAttribute('media').indexOf(
+    return (document.getElementsByTagName('link')[1].getAttribute('media').indexOf(
         'screen') != -1 || (document.styleSheets &&
         (document.styleSheets[0].media.mediaText.indexOf(
             'screen') != -1 || document.styleSheets[0].media.indexOf(
diff --git a/prestatic/general.css b/prestatic/general.css
index 3020834..e267fdd 100644
--- a/prestatic/general.css
+++ b/prestatic/general.css
@@ -328,6 +328,10 @@ thead, tfoot {
     margin: 10px auto 0 auto;
 }
 
+caption {
+    caption-side: bottom;
+}
+
 
 /* Formatting-related classes */
 
diff --git a/rules.mege b/rules.mege
index cd4bbc7..5a97989 100644
--- a/rules.mege
+++ b/rules.mege
@@ -5,7 +5,7 @@ url http://metanohi.name/
 description 'This feed contains the newest pages on metanohi'
 author Niels\ Serup
 email ns@metanohi.org
-aboutauthorurl http://metanohi.name/about/niels/
+aboutauthorurl http://metanohi.name/about/niels
 feeditems 40
 
 template template.html
@@ -15,6 +15,10 @@ convert prestatic/*.{css,js} static/
 convert prestatic/template.html .
 
 # Redirects (in site/)
+## temp
+redirect projects/{showandkill,sak} https://gitorious.org/nqpz-config/nqpz-config/blobs/raw/master/home/.emacs.d/site-lisp/showandkill.el
+
+## old
 redirect mege projects/mege/
 redirect aboutme about/niels
 redirect about/img-licenses about/media-licenses
diff --git a/scripts/hook_new.sh b/scripts/hook_new.sh
index dbcce3f..e101e4d 100755
--- a/scripts/hook_new.sh
+++ b/scripts/hook_new.sh
@@ -9,4 +9,4 @@ cd ~/www/meta/nohi
 
 git pull
 git feed
-git restart
+mege restart
diff --git a/site/projects/img/mege.png b/site/projects/img/mege.png
new file mode 100644
index 0000000..5976acc
Binary files /dev/null and b/site/projects/img/mege.png differ
diff --git a/site/projects/index.org b/site/projects/index.org
index b4d223c..5124c09 100644
--- a/site/projects/index.org
+++ b/site/projects/index.org
@@ -13,7 +13,8 @@ These are my projects, new and old.
 #++exec
 #+BEGIN_SRC python3
   top_projs = (
-      'desurveil', 
+      'mege',
+      'desurveil',
       'aeltei',
       ('roptoligs', 'roptoligs', 'RPG project with planned modules and games',
        'http://roptoligs.metanohi.name/'),
@@ -42,6 +43,7 @@ These are my projects, new and old.
       )
    
   other_projs = (
+      'kando',
       'nanonote',
       ('pdfsplit', 'A small Python script to split PDF files on a page-basis',
        'http://projects.metanohi.name/misc/pdfsplit.tar.gz'),
diff --git a/site/projects/kando/index.org b/site/projects/kando/index.org
new file mode 100644
index 0000000..c64d5f1
--- /dev/null
+++ b/site/projects/kando/index.org
@@ -0,0 +1,22 @@
+#+title: kando
+#&summary
+A simple todo list manager with Emacs integration
+#&
+#+license: bysa, text
+#+license: apache 2, program
+
+* kando
+
+kando cannot do much. But it can do enough. 
+#&-large
+It is a simple todo manager. 
+#&
+#&-huge
+[[kando-0.1.0.tar.gz][Download]].
+#&
+
+kando is released under the Apache License, version 2.0.
+
+kando can also be found in the [[http://pypi.python.org/pypi/kando][Python Package Index]].
+
+kando has its code at Gitorious; see [[http://gitorious.org/kando]].
diff --git a/site/projects/mege/tests/tables.org b/site/projects/mege/tests/tables.org
index 54e9105..e9461ad 100644
--- a/site/projects/mege/tests/tables.org
+++ b/site/projects/mege/tests/tables.org
@@ -31,6 +31,15 @@ tables, this test contains more. And they're all different.
 |--------+-----|
 | Name   | Age |
 
+** With caption
+
+#+caption: Persons
+| Name   | Age |
+|--------+-----|
+| Xryurg | 300 |
+| Bkrau  |   2 |
+
+
 ** Inline formatting in table
 
 | URL             | Exists |
diff --git a/site/writings/bash-prompt.org b/site/writings/bash-prompt.org
index a991ae6..5bc323d 100644
--- a/site/writings/bash-prompt.org
+++ b/site/writings/bash-prompt.org
@@ -9,8 +9,29 @@ What my prompt does and what it looks like.
 I have my own bash prompt. To use it, first, copy this into your ~.bashrc~:
 
 #+BEGIN_SRC sh
-PROMPT_COMMAND="EXCO=$?;pwdw=$(($COLUMNS-20))"
-PS1='\[\033[00m\]$(if [ $EXCO == 0 ]; then echo -ne "\[\033[42m\]\[\033[01;30m\]"; else echo -ne "\[\033[41m\]\[\033[01;34m\]"; fi)$(length-extra-prepend $EXCO 3)\[\033[45m\] \[\033[44m\]\[\033[01;37m\]$(date +%H:%M)\[\033[45m\] \[\033[46m\]\[\033[01;33m\]$(length-too-much-shorten "$(pwd | sed s%$HOME%~%)" $(if (( $pwdw < 20 )); then echo -n 20; else echo -n $pwdw; fi))\[\033[00m\]\n\[\033[45m\]\[\033[01;33m\]\u\[\033[01;32m\]@\[\033[01;36m\]\h\[\033[43m\]\[\033[01;30m\]:\[\033[40m\]\[\033[01;33m\]\$\[\033[00m\] '
+function ps1lr {
+    if [ $1 == 0 ]; then
+        echo -ne "\033[42m\033[01;30m"
+    else
+        echo -ne "\033[41m\033[01;34m"
+    fi
+    length-extra-prepend $1 3
+}
+
+function ps1sp {
+    pwdw=$(($COLUMNS-20))
+    if (( $pwdw < 40 )); then
+        pwdw=40
+    fi
+    length-too-much-shorten "$(pwd | sed s%$HOME%~%)" $pwdw
+}
+
+#PROMPT_COMMAND=""
+PS1='\[\033[00m\]$(ps1lr $?)\[\033[45m\] \[\033[44m\]\[\033[01;37m\]\
+$(date +%H:%M)\[\033[45m\] \[\033[46m\]\[\033[01;33m\]\
+$(ps1sp)\[\033[00m\]\n\[\033[45m\]\[\033[01;33m\]\u\[\033[01;32m\]@\
+\[\033[01;36m\]\h\[\033[43m\]\[\033[01;30m\]:\[\033[40m\]\
+\[\033[01;33m\]\$\[\033[00m\] '
 #+END_SRC
 
 Second, download [[bash-prompt-extras.tar.gz]] and put the included programs