Fix color order