Fix color cycling