Lots of small template tweaks pulled in from theme-dev.