Fixed quirk with generator and builder w/older themes