For X, considering he literally puts his mask on from his driver maybe you could collect different Rider masks to add to the driver. No different than what they've been doing for the current collectables in giving the currently collectable a past Rider paint job.