Assorted theme improvements and tweaks