minor adaptions to color order