ENH: fix colors more