Replace Dark with Spread in several places