diff --git a/nginx/base.conf b/nginx/base.conf
index 444c68a..5d4ba3d 100644
--- a/nginx/base.conf
+++ b/nginx/base.conf
@@ -76,6 +76,9 @@ location / {
rewrite ^/writings/digital-sikring\.html$ /digital-sikring last;
+ rewrite ^/projects/magicng /magicng last;
+ rewrite ^/writings/magicng /magicng last;
+
rewrite ^/bsq https://old-projects.metanohi.name/bsq/;
rewrite ^/gt3000 https://old-projects.metanohi.name/gt3000/;
@@ -97,6 +100,8 @@ location / {
rewrite ^/x https://old-projects.metanohi.name/x/;
+ rewrite ^/totxt https://old-projects.metanohi.name/totxt/;
+
# Ordinary handling.
try_files $uri $uri.html $uri/ =404;
diff --git a/site/about/img/fsfmember.png b/site/about/img/fsfmember.png
deleted file mode 100644
index cd24dd0..0000000
Binary files a/site/about/img/fsfmember.png and /dev/null differ
diff --git a/site/about/img/niels-eyes.png b/site/about/img/niels-eyes.png
deleted file mode 100644
index 2df47c1..0000000
Binary files a/site/about/img/niels-eyes.png and /dev/null differ
diff --git a/site/about/img/niels-hipster.jpg b/site/about/img/niels-hipster.jpg
deleted file mode 100644
index e87b71c..0000000
Binary files a/site/about/img/niels-hipster.jpg and /dev/null differ
diff --git a/site/about/img/scr1.png b/site/about/img/scr1.png
deleted file mode 100644
index 27edf15..0000000
Binary files a/site/about/img/scr1.png and /dev/null differ
diff --git a/site/about/img/scr2.png b/site/about/img/scr2.png
deleted file mode 100644
index ff8702c..0000000
Binary files a/site/about/img/scr2.png and /dev/null differ
diff --git a/site/about/img/scr3.png b/site/about/img/scr3.png
deleted file mode 100644
index 1dc13ba..0000000
Binary files a/site/about/img/scr3.png and /dev/null differ
diff --git a/site/about/index.md b/site/about/index.md
new file mode 100644
index 0000000..0b49ea6
--- /dev/null
+++ b/site/about/index.md
@@ -0,0 +1,43 @@
+# About metanohi.name
+
+This is metanohi.name, the personal website of
+[Niels G. W. Serup](niels).
+
+
+## Source code
+
+This website is statically generated from the files in a git repository.
+
+Get the site:
+: $ git clone git://metanohi.name/metanohi
+
+The git history goes back to 2011.
+
+
+## History
+
+metanohi was created in 2009 as a spinoff of earlier projects with equally
+undefined purposes. Back then the website was at metanohi.*org* instead of
+metanohi.*name*.
+
+The first version from 2009 was written in PHP.
+
+The second version from 2011 was written in Python 3.
+
+This is the third version of the website.
+
+
+## Choice of name
+
+There are several reasons for the choice of "metanohi":
+
+ + It's unique.
+ + It starts with "meta".
+ + It probably means *something* in some languages. It must!
+
+
+## Copying
+
+Unless otherwise noted, feel free to copy and remix things from this
+site. For the fun of it, consider them licensed under the
+[[http://www.wtfpl.net/][Do What The Fuck You Want To Public License (WTFPL)]]
diff --git a/site/about/index.org b/site/about/index.org
deleted file mode 100644
index d08b42c..0000000
--- a/site/about/index.org
+++ /dev/null
@@ -1,91 +0,0 @@
-#+title: About metanohi
-#+summary: A short description of what metanohi is
-#+license: wtfpl
-#+startup: showall
-#&toc
-
-* About metanohi
-
-This is metanohi, the personal website of [[./niels][Niels G. W. Serup]].
-
-
-** Copying
-
-Essentially, if you use something from metanohi, please attribute Niels
-G. W. Serup and metanohi (unless it's not by Niels, which is rare).
-
-In general, text, images, code and any other type of work on metanohi are
-available under the [[http://www.wtfpl.net/][Do What The Fuck You Want To Public License (WTFPL)]] for the
-fun of it; read more about this [[/writings/licensing][here]] if you so care. There may be other cases.
-The status of a page can be seen in the bottom in a metadata box. If no license
-is specified in the box, it's either because it's unnecessary to have a license
-for that page (for example if it just an index page), or it's because I forgot
-to apply one to the page, or it's because I don't care.
-
-
-** Source code
-
-metanohi is run by the [[/projects/mege/][mege]] HTML generator. If you want to use it for a new
-website (I REALLY REALLY wouldn't), you may wish to use metanohi as a template.
-
-Get the main site:
-: $ git clone git://metanohi.name/metanohi-metanohi
-
-Get the subsites (messy):
-: $ git clone git://metanohi.name/metanohi-meta
-
-
-** SSL/TLS
-
-You can access metanohi from HTTPS. metanohi uses a [[http://cacert.org][CAcert]] (or is it a
-self-signed certificate now? I forget). To make your browser automatically
-accept CAcerts, follow the instructions on [[https://wiki.cacert.org/FAQ/BrowserClients][CAcerts wiki]]; it doesn't take long.
-At some point it might get a LetsEncrypt certificate.
-
-
-** History
-
-metanohi was created in 2009 as a spinoff of earlier projects with equally
-undefined purposes. Back then the website was at metanohi./org/ instead of
-metanohi./name/.
-
-*Note:* While most of the content from the old metanohi has been ported to this
-improved version, the modification times have not been saved. This is why old
-projects from 2009 and 2010 appear to have been created in July or August, 2011.
-
-*** Choice of name
-
-There are several reasons for the choice of "metanohi":
-
- + It's unique
- + It's simple
- + It has the meta prefix, which automatically transforms anything into
- something cool
- + "metanohi", or at least part of "metanohi", has meanings in some languages
-
-*** Screenshots of the old metanohi
-
-Click to go to fullsize image.
-
-#&img;url=img/scr1.png,width=300,float=left,noclear,medlink,caption=Start page
-#&img;url=img/scr2.png,width=300,float=left,noclear,medlink,caption=Projects page
-#&img;url=img/scr3.png,width=300,float=left,noclear,medlink,caption=CSS fun
-#&clear
-
-
-** Language
-
-metanohi is generally only available in English. A few pages are in Danish.
-
-
-** Miscellaneous
-
-metanohi is mostly XHTML 1.1 and CSS 2 valid. Currently, metanohi.name pages
-are served as text/html and not as application/xml+xhtml (as they should). This
-might get fixed (it is extremely easy to fix, but if fixed, some things
-depending on external JavaScript which depends on non-XHTML, like the FSF
-widget on the propaganda page, might cease to work).
-
-[[./links][Propaganda]]
-
-Should I go to HTML 5? I don't really care.
diff --git a/site/about/javascript.org b/site/about/javascript.org
deleted file mode 100644
index 663a8a1..0000000
--- a/site/about/javascript.org
+++ /dev/null
@@ -1,19 +0,0 @@
-#+title: JavaScript License Information
-#+summary: A table of the JavaScript used on metanohi
-#+license: wtfpl
-
-* JavaScript License Information
-
-metanohi uses JavaScript. It's not much, and it can probably be considered
-trivial for now, but it's there.
-
-This page lists the JavaScript files in use and the licenses they are
-under. All of them are free software. This page conforms to the [[https://www.gnu.org/licenses/javascript-labels.html][JavaScript
-License Web Labels]] method published by GNU.
-
-#+%id: jslicense-labels1
-| JavaScript file | License | Unminified file |
-|-----------------------+--------------+-----------------------|
-| [[/static/aesthetics.js]] | [[http://creativecommons.org/publicdomain/zero/1.0/legalcode][CC0-1.0-only]] | [[/static/aesthetics.js]] |
-| [[/static/extra.js]] | [[http://creativecommons.org/publicdomain/zero/1.0/legalcode][CC0-1.0-only]] | [[/static/extra.js]] |
-
diff --git a/site/about/links.org b/site/about/links.org
deleted file mode 100644
index e211328..0000000
--- a/site/about/links.org
+++ /dev/null
@@ -1,77 +0,0 @@
-#+title: Links
-#+summary: Various links.
-#+license: wtfpl
-#+startup: showall
-
-#++show
-#+BEGIN_SRC javascript
- // Add the FSF widget after the page has loaded.
- window.addEventListener('load',
- function(event) {
- add_fsf_widget(8085);
- }, false);
-#+END_SRC
-
-
-* Hyperlinks
-
-My first web pages from ca. 2004 contained pages whose only purpose was to show
-links to other sites, because that's what you use websites for. With this page I
-intend to carry on with this tradition.
-
-Note: I have not updated this rather silly page since about 2012.
-
-** Passive activism[fn:oxymoron]
-
-Beware, for the following Hyperlinks contain Knowledge!
-
-#++show
-#+BEGIN_SRC html
-
-#+END_SRC
-
-
-#&img;url=img/fsfmember.png, medlink=http://www.fsf.org/associate/support_freedom/join_fsf?referrer=8085
-
-(I'm not currently a member, but I used to be.)
-
-
-[fn:oxymoron] "Passive activism" is an oxymoron. Activism is, of course, not a
- passive thing. But links stowed on a web page certainly is.
diff --git a/site/about/media-licenses.org b/site/about/media-licenses.org
deleted file mode 100644
index ca7344c..0000000
--- a/site/about/media-licenses.org
+++ /dev/null
@@ -1,16 +0,0 @@
-#+title: Licenses of media
-#+summary: A table of licenses of media not attributed in-page
-
-* Licenses of media
-
-| Path | License |
-|---------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------|
-| [[/img/licenses/]]~cc*~ | CC BY [[http://creativecommons.org][creativecommons.org]] |
-| [[/img/licenses/]]~*gpl.png~ | See [[http://www.gnu.org/graphics/license-logos.html]] |
-| [[/img/licenses/]]~freecontent.*~ | Public domain |
-| [[http://projects.metanohi.name/bsq/Cerebral_lobes.png]] | Image released under GFDL 1.2 or any later version. Author unknown. See [[http://commons.wikimedia.org/wiki/File:Cerebral_lobes.png]]. |
-| [[http://projects.metanohi.name/bsq/Cerveau_anime.gif]] | Image released under GFDL 1.2 or any later version. Author: modifié par Azariel. See [[http://commons.wikimedia.org/wiki/File:Cerveau_animé.gif]]. |
-| [[http://projects.metanohi.name/bsq/Friendly_stickman.png]] | Image released under WTFPL 2.0. |
-| [[http://projects.metanohi.name/x/img/linux.png]] | Image copyright of Larry Ewing, Simon Budig and Anja Gerwinski. See [[http://commons.wikimedia.org/wiki/File:Tux.svg]]. |
-| [[http://projects.metanohi.name/x/img/textsize.jpg]] | Public domain |
-
diff --git a/site/about/niels.org b/site/about/niels.md
similarity index 62%
rename from site/about/niels.org
rename to site/about/niels.md
index 2a2a1ec..f099bb5 100644
--- a/site/about/niels.org
+++ b/site/about/niels.md
@@ -1,60 +1,58 @@
-#+title: About Niels
-#+summary: A short description of metanohi's creator
-#+license: wtfpl
-#+startup: showall
-#&toc
+# About Niels
-* About Niels
+I, Niels G. W. Serup, is the creator of metanohi. I was born in 1992
+and live in Copenhagen, Denmark.
-I, Niels G. W. Serup, is the creator of metanohi. I was born in 1992 and live
-in Copenhagen, Denmark.
+I study computer science at [[http://diku.dk/][DIKU]] where I am also
+part of the yearly student revue [[http://dikurevy.dk/][DIKUrevy]] and
+the [[http://kantinen.org][Canteen association]], among other things.
-I study computer science at [[http://diku.dk/][DIKU]] where I am also part of the yearly student
-revue [[http://dikurevy.dk/][DIKUrevy]] and the [[http://kantinen.org][Canteen association]], among other things. Some videos
-from the revue has been put up online at [[http://youtube.com/DIKUrevy]].
-
-While online, I go by the nickname "ngws" (and a few others).
+While online, I usually go by the nickname "ngws" or variations thereof.
-** Contact
+## Contact
-I can be contacted at [[mailto:ngws@metanohi.name][ngws@metanohi.name]]. I also hang out as ngws in #diku on
-irc.freenode.net.
+I can be contacted at [[mailto:ngws@metanohi.name][ngws@metanohi.name]].
+I also hang out as `ngws` in `#diku` on `irc.freenode.net`.
-** Things I use
+## Things I use
-*** Emacs
+### Emacs
-Emacs is a nice text editor. [[http://www.gnu.org/software/emacs/][Get it]].
+Emacs is a nice text editor.
+[[http://www.gnu.org/software/emacs/][Get it]].
-*** Firefox
+### Firefox
-Firefox is okay. I use it with the Pentadactyl extension to make it more like
-Emacs.
+Firefox is okay. I use it with the Pentadactyl extension to make it
+more like Emacs.
-*** StumpWM
+### StumpWM
-StumpWM is a nice tiling, Emacs-like window mananger. It has much fewer features
-than e.g. XMonad (another tiling wm), but it's simple and efficient. [[http://stumpwm.antidesktop.net/cgi-bin/wiki.pl][Get it]].
+StumpWM is a tiling, Emacs-like window mananger. It has fewer features
+than e.g. XMonad (another tiling wm), but it's simple and
+understandable. I don't even have to add a keybinding for running Emacs
+-- it's already there! [[https://stumpwm.github.io/][Get it]].
-*** Debian
+### Debian
-I run Debian testing with only a small amount of proprietary software. [[http://debian.org/][Get
-Debian]].
+I run Debian testing with only a small amount of proprietary software.
+[[http://debian.org/][Get Debian]].
-*** Dvorak
+### Dvorak
I use the a modified variant of the Danish Dvorak keyboard layout. This is my
-"~/.Xmodmap":
-#+BEGIN_SRC
+`~/.Xmodmap`:
+
+```
keycode 108 = Mode_switch
keycode 34 = apostrophe acute quotedbl
keycode 21 = grave dead_caron dead_acute
keycode 35 = Tab equal backslash bar
-keycode 36 = Return dead_diaeresis dead_grave
+keycode 36 = Return
keycode 49 = section brokenbar paragraph dead_circumflex
keycode 10 = 1 exclam onesuperior exclamdown
keycode 11 = 2 EuroSign twosuperior ssharp
@@ -67,11 +65,11 @@ keycode 17 = 8 parenleft bracketleft eth
keycode 18 = 9 parenright bracketright ETH
keycode 19 = 0 equal braceright NoSymbol braceright
-keysym a = a A at at at at
-keysym o = o O exclam
-keysym u = u U parenleft
+keysym a = a A at dead_diaeresis
+keysym o = o O exclam dead_grave
+keysym u = u U parenleft parenleft parenleft
keysym e = e E slash backslash slash backslash
-keysym h = h H parenright
+keysym h = h H parenright parenright parenright
keysym t = t T asciitilde dead_tilde
keysym n = n N asterisk
keysym s = s S plus plusminus
@@ -90,23 +88,19 @@ keysym k = k K bracketleft
keysym b = b B bracketright
keysym m = m M bar brokenbar
keysym j = j J Insert
-#+END_SRC
-My keyboard layout can be achieved by running
-#+BEGIN_SRC
+```
+
+I run these commands to properly enable it:
+```
setxkbmap dk dvorak
setxkbmap -option ctrl:swapcaps
xmodmap $HOME/.Xmodmap
-#+END_SRC
-This works quite well. In patterns such as
-#+BEGIN_SRC
-key(code|sym) x = a b c d
-#+END_SRC
-~a~ is entered if one presses -x-, ~b~ is entered if one presses -Shift+x-, ~c~
-is entered if one presses -AltGr+x-, and ~d~ is entered if one presses
--Shift+AltGr+x-. ~man xmodmap~ gives more information.
+```
+
+It works quite well.
-** Virtual existences
+## Virtual existences
Most of these I don't use actively.
@@ -124,29 +118,24 @@ Most of these I don't use actively.
+ [[http://identi.ca/nqpz][StatusNet]]
-** Keys
+## Keys
-*** SSH
+### SSH
-#&pre
+```
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwEmn04iNjoD8wCFTQdadsAmlRRsQHJKgggPo9ZVKlCuZIkKiPuspkio2JUnAx4ppyOTS63MdbGF88V5cI+//vj983oHN29we8CHvhb31Y/LfMmjFtEdnv3q2lPu/102zbCr/fZ/Pz3nxEOMRZa46qWdut8Jvu48wJ4IBKPTMteDPblPl9m8WeN2ueUbxrcR3Pb/NBndTbGEBd+I4IezVwmWuDTsEWpgEw8p/A5wCw03yX6v9wiK2Zl1/LPLAJaJfLd2+9qDBOKnpu/pkYsCQUJdDqPcYB13ys3Fo4kS84MYZE2HMwpXCb0aC7ywUW3ktlb6jTXFCvh2dK8FggfQRiw== niels@westshiba
-#&
+```
-*** PGP
+### PGP
-#&pre
+```
pub 2048R/85445363 2014-06-11
uid Niels G. W. Serup
sub 2048R/7CFE0D20 2014-06-11
-#&
+```
-** Photo
+## Hongabar
-#&img;url=img/niels-hipster.jpg, width=600, center, caption=Niels (kind of)
-
-
-** Hongabar
-
-[[http://hongabar.org/]] is the main domain of the server that I share with a
-friend.
+[[https://hongabar.org/]] is the main domain of the server that I share
+with a friend.
- 
- 
- 
-