Nuovo theme update: getting down to the tricky part