Lots of cleanup and tidying.

Also make settings dialog actually save settings, no more theme
dropdown. Getting ready for a nice and tidy release!