Try and make the current theme a bit more usable. More work required.