MOAR theme update fixes