It'd be nice if this wasn't done in the HTML templates; doing it this way means *every* theme needs to handle this if we want them to have feature-parity.