Ugh... sorry, really should have tried building with the new master pages, as Björn's message indicates. Also note that I could not use Caolan's script for some reason, so I unzipped them manually and then used sed on styles.xml... Astron.