Add colors to map
Merge branch 'map-colors'