Lots of improvements, theme nearly done