Feature/map colors

Map colors after score or after criteria