Tidy up keyboard translation setting code.
Reordered org mode agenda files.
Updated the TODO file.