Tweak styling of active swatches, and bump version to 2.5.0-rc.7.