A leaner theme

This is a proposal to lean down the theme from extra whitespace introduced by the default template. I put the details in a previous PR (#628) that was messed up with extra commits, so I hope I don't need to supply all the rationale again.

I was having a problem with the generated test output but I wasn't sure how to fix it so I expect a bit of dialog. One of the unit tests was failing even though I regenerated the functional test output and I don't know why.