Add new image types. Fix random.