Add uuid generator, clean up theme