Cleanup theme a bit, fix some bugs