Fixed conflict that made colors not sync anymore