several small theme fixes