lots of theme improvements