Added the color-swap feature