diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index 9ce96d6bd..f1f2e60b0 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -226,6 +226,13 @@
 @poi_label: #8C8C8C;
 @subway_label: #9E9E9E;
 @indigenous_label: #6A512F;
+@shop_label: #8C5F93;
+@food_label: #BB9342;
+@culture_label: #7F5933;
+@hotel_label: #6D544C;
+@healthcare_label: #C15746;
+@industry_label: #717065;
+@public_transport_label: #2F6499;
 
 /* 6.4 Road labels */
 
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 58a2118c4..c591f4d31 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -22,6 +22,7 @@
  6.1 Craft
 7.CAR
  7.1 Parking
+8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -43,7 +44,7 @@ node|z18-[office],
 {icon-image: office-m.svg;}
 
 node|z18-[craft],
-{icon-image: craft-m.svg;}
+{text-color: @shop_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;icon-image: craft-m.svg;}
 
 node|z16-[shop],
 {icon-min-distance: 10;}
@@ -204,30 +205,30 @@ node|z19-[amenity=water_point][drinking_water=not],
 
 node|z12-[railway=station],
 node|z13-[railway=halt],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 node|z12-[railway=station]::int_name,
 node|z13-[railway=halt]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 node|z17-[railway=tram_stop],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z17-[railway=tram_stop]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z17-[highway=bus_stop],
 node|z14-[amenity=bus_station],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
 node|z17-[highway=bus_stop]::int_name,
 node|z14-[amenity=bus_station]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
 
 node|z10-[aeroway=aerodrome][aerodrome=international],
 node|z14-[aeroway=aerodrome],
 node|z15-[aerialway=station],
 node|z16-[amenity=ferry_terminal]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 
 /* 3.1 Train Station */
 
@@ -347,7 +348,10 @@ node|z14-[aeroway=aerodrome]::int_name,
 {font-size: 11;}
 
 node|z16-[aeroway=helipad],
-{icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @poi_label;}
+{icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
+
+node[aerialway=station]
+{text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
 
 /* 3.7 Aerialway */
 
@@ -1357,7 +1361,7 @@ node|z18-[power=generator][generator:source=wind],
 node|z15-[power=plant][plant:source=wind],
 {icon-image: power_plant_wind-m.svg;}
 node|z16-[power=plant][plant:source=wind],
-{text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
+{text: name;text-color: @industry_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
 
 node|z17-[amenity=shower],
 {icon-image: shower-m.svg;}
@@ -2057,3 +2061,216 @@ node|z17-[amenity=motorcycle_parking],
 
 node|z18-[amenity=parking_space][parking_space=disabled],
 {icon-image: parking-disabled-m.svg;}
+
+/* 8. Colored Labels */
+
+node|z14-[shop=mall],
+node|z15-[shop=car_repair][service=tyres],
+node|z16-[amenity=studio],
+node|z16-[shop=alcohol],
+node|z16-[shop=antiques],
+node|z16-[shop=art],
+node|z16-[shop=bakery],
+node|z16-[shop=beauty],
+node|z16-[shop=beverages],
+node|z16-[shop=bicycle],
+node|z16-[shop=books],
+node|z16-[shop=butcher],
+node|z16-[shop=camera],
+node|z16-[shop=car],
+node|z16-[shop=caravan],
+node|z16-[shop=charity],
+node|z16-[shop=cheese],
+node|z16-[shop=chemist],
+node|z16-[shop=chocolate],
+node|z16-[shop=clothes],
+node|z16-[shop=computer],
+node|z16-[shop=confectionery],
+node|z16-[shop=convenience],
+node|z16-[shop=copyshop],
+node|z16-[shop=cosmetics],
+node|z16-[shop=deli],
+node|z16-[shop=department_store],
+node|z16-[shop=doityourself],
+node|z16-[shop=dry_cleaning],
+node|z16-[shop=electronics],
+node|z16-[shop=erotic],
+node|z16-[shop=farm],
+node|z16-[shop=florist],
+node|z16-[shop=furniture],
+node|z16-[shop=garden_centre],
+node|z16-[shop=gift],
+node|z16-[shop=greengrocer],
+node|z16-[shop=grocery],
+node|z16-[shop=hairdresser],
+node|z16-[shop=hardware],
+node|z16-[shop=health_food],
+node|z16-[shop=houseware],
+node|z16-[shop=interior_decoration],
+node|z16-[shop=jewelry],
+node|z16-[shop=kiosk],
+node|z16-[shop=kitchen],
+node|z16-[shop=laundry],
+node|z16-[shop=mobile_phone],
+node|z16-[shop=motorcycle],
+node|z16-[shop=music],
+node|z16-[shop=musical_instrument],
+node|z16-[shop=optician],
+node|z16-[shop=outdoor],
+node|z16-[shop=pasta],
+node|z16-[shop=pastry],
+node|z16-[shop=pet],
+node|z16-[shop=photo],
+node|z16-[shop=rental],
+node|z16-[shop=rental][rental=bike],
+node|z16-[shop=seafood],
+node|z16-[shop=second_hand],
+node|z16-[shop=sewing],
+node|z16-[shop=shoes],
+node|z16-[shop=sports],
+node|z16-[shop=stationery],
+node|z16-[shop=supermarket],
+node|z16-[shop=tattoo],
+node|z16-[shop=ticket],
+node|z16-[shop=toys],
+node|z16-[shop=tyres],
+node|z16-[shop=video],
+node|z16-[shop=video_games],
+node|z16-[shop=wine],
+node|z17-[leisure=bowling_alley],
+node|z17-[shop=variety_store],
+node|z18-[amenity=internet_cafe],
+node|z18-[shop],
+node|z18-[shop=auction],
+node|z18-[shop=collector],
+node|z18-[shop=fabric],
+node|z18-[shop=funeral_directors],
+node|z18-[shop=hearing_aids],
+node|z18-[shop=lottery],
+node|z18-[shop=tobacco],
+node|z18-[shop=wholesale],
+{text: name; text-color: @shop_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-offset:1;}
+
+node|z15-[amenity=bar],
+node|z15-[amenity=biergarten],
+node|z15-[amenity=cafe],
+node|z15-[amenity=fast_food],
+node|z15-[amenity=food_court],
+node|z15-[amenity=pub],
+node|z15-[amenity=restaurant],
+node|z16[amenity=ice_cream],
+node|z16-[amenity=nightclub],
+node|z18-[amenity=stripclub],
+{text: name;text-color: @food_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-offset:1;}
+
+node[amenity=arts_centre],
+node[amenity=community_centre],
+node[amenity=place_of_worship]
+node[amenity=social_facility],
+node[amenity=theatre],
+node[attraction=amusement_ride],
+node[attraction=animal],
+node[attraction=big_wheel],
+node[attraction=bumper_car],
+node[attraction=carousel],
+node[attraction=historic],
+node[attraction=maze],
+node[attraction=roller_coaster],
+node[leisure=escape_game],
+node[leisure=stadium],
+node[tourism=aquarium],
+node[tourism=attraction],
+node[tourism=gallery],
+node[tourism=museum],
+node[tourism=theme_park],
+node[tourism=zoo]
+node[tourism=zoo],
+node|z15-[historic=ship],
+node|z16-[amenity=conference_centre],
+node|z16-[amenity=events_venue],
+node|z16-[amenity=exhibition_centre],
+node|z16-[leisure=marina],
+node|z16-[leisure=water_park],
+node|z17-[amenity=casino],
+node|z17-[amenity=gambling],
+node|z17-[amenity=public_bath],
+node|z17-[leisure=adult_gaming_centre],
+node|z17-[leisure=amusement_arcade],
+{text-color: @culture_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+
+node|z13-[tourism=alpine_hut],
+node|z16-[leisure=resort],
+node|z16-[tourism=apartment],
+node|z16-[tourism=chalet],
+node|z16-[tourism=guest_house],
+node|z16-[tourism=hostel],
+node|z16-[tourism=hotel],
+node|z16-[tourism=motel],
+node|z16-[tourism=wilderness_hut],
+{text-color: @hotel_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+
+area[amenity=hospital],
+node[amenity=clinic],
+node[amenity=dentist],
+node[amenity=doctors],
+node[amenity=hospital],
+node[amenity=pharmacy],
+node[amenity=veterinary],
+node[healthcare],
+{text-color: @healthcare_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+
+area[amenity=university][name]
+node[aeroway=gate],
+node[amenity=atm],
+node[amenity=bank],
+node[amenity=bureau_de_change],
+node[amenity=charging_station][motorcar?],
+node[amenity=childcare],
+node[amenity=college],
+node[amenity=courthouse],
+node[amenity=driving_school],
+node[amenity=kindergarten],
+node[amenity=language_school],
+node[amenity=library],
+node[amenity=money_transfer],
+node[amenity=music_school],
+node[amenity=nursing_home],
+node[amenity=police],
+node[amenity=post_office],
+node[amenity=prison],
+node[amenity=school],
+node[amenity=townhall],
+node[amenity=university][name],
+node[barrier=border_control],
+node[leisure=beach_resort],
+node[leisure=hackerspace],
+node[office],
+node|z14-[amenity=fuel],
+node|z15-[landuse=industrial][industrial=mine],
+node|z15-[landuse=quarry],
+node|z15-[tourism=information][information=office],
+node|z16-[amenity=vehicle_inspection],
+node|z16-[shop=car_parts],
+node|z16-[shop=car_repair],
+node|z16-[shop=dry_cleaning],
+node|z16-[shop=laundry],
+node|z16[shop=motorcycle_repair],
+node|z17-[amenity=car_wash],
+node|z17-[amenity=motorcycle_rental],
+node|z17-[leisure=dance],
+node|z17-[leisure=fitness_centre],
+node|z17-[leisure=sports_centre],
+node|z17-[leisure=sports_hall],
+node|z17-[man_made=works],
+node|z17-[shop=money_lender],
+node|z17-[shop=pawnbroker],
+node|z17-[sport=yoga],
+node|z18-[amenity=car_rental],
+node|z18-[amenity=car_sharing],
+node|z18-[amenity=fire_station],
+node|z18-[shop=bookmaker],
+{text-color: @industry_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+
+node[amenity=bicycle_rental],
+node[amenity=taxi],
+{text-color: @public_transport_label;text-halo-radius: 0.2;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index 5fafc2074..25a4b0bdc 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -224,6 +224,13 @@
 @poi_label: #444444;
 @subway_label: #333333;
 @indigenous_label: #6A512F;
+@shop_label: #A6668E;
+@food_label: #D48654;
+@culture_label: #82512D;
+@hotel_label: #54413B;
+@healthcare_label: #BF4F56;
+@industry_label: #5F676E;
+@public_transport_label: #275480;
 
 /* 6.4 Road labels */