Lots of theme tweaks. Features:

 - A lot of tweaks within #4
 - Also fixes #5