fix order so colors are right