Various theme edits and fixes