Added color-swap back