Assorted theme fixes