Feature/map colors