[styles] Recategorize icons

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

data/styles/default/include/Icons.mapcss

@@ -44,7 +44,7 @@ node|z18-[office],
 {icon-image: office-m.svg;}
 
 node|z18-[craft],
-{icon-image: craft-m.svg;}
+{text-color: @industry_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;}
@@ -1457,7 +1457,7 @@ node|z17-[amenity=prison],
 node|z18-[amenity=prison],
 {font-size: 11;}
 
-node|z15-[amenity=townhall],
+node|z16-[amenity=townhall],
 {icon-image: public-building-m.svg;}
 node|z17-[office=diplomatic],
 {icon-image: embassy-m.svg;}
@@ -2269,4 +2269,239 @@ node|z18-[amenity=parking_space][parking_space=disabled],
 
 /* 8. Colored Labels */
 
-@import("../../default/include/Icons_Label_Colors.mapcss");
+node[amenity=car_rental],
+node[amenity=car_sharing],
+node[amenity=internet_cafe],
+node[amenity=marketplace],
+node[amenity=motorcycle_rental],
+node[shop=alcohol],
+node[shop=antiques],
+node[shop=art],
+node[shop=auction],
+node[shop=bakery],
+node[shop=beauty],
+node[shop=beverages],
+node[shop=bicycle],
+node[shop=books],
+node[shop=butcher],
+node[shop=camera],
+node[shop=car],
+node[shop=caravan],
+node[shop=charity],
+node[shop=cheese],
+node[shop=chemist],
+node[shop=chocolate],
+node[shop=clothes],
+node[shop=collector],
+node[shop=computer],
+node[shop=confectionery],
+node[shop=convenience],
+node[shop=copyshop],
+node[shop=cosmetics],
+node[shop=deli],
+node[shop=department_store],
+node[shop=doityourself],
+node[shop=dry_cleaning],
+node[shop=dry_cleaning],
+node[shop=electronics],
+node[shop=erotic],
+node[shop=fabric],
+node[shop=farm],
+node[shop=florist],
+node[shop=furniture],
+node[shop=garden_centre],
+node[shop=gift],
+node[shop=greengrocer],
+node[shop=grocery],
+node[shop=hairdresser],
+node[shop=hardware],
+node[shop=health_food],
+node[shop=hearing_aids],
+node[shop=houseware],
+node[shop=interior_decoration],
+node[shop=jewelry],
+node[shop=kiosk],
+node[shop=kitchen],
+node[shop=laundry],
+node[shop=laundry],
+node[shop=lighting],
+node[shop=mall],
+node[shop=mobile_phone],
+node[shop=motorcycle],
+node[shop=music],
+node[shop=musical_instrument],
+node[shop=optician],
+node[shop=outdoor],
+node[shop=pasta],
+node[shop=pastry],
+node[shop=pawnbroker],
+node[shop=pet],
+node[shop=photo],
+node[shop=rental],
+node[shop=rental][rental=bike],
+node[shop=seafood],
+node[shop=second_hand],
+node[shop=sewing],
+node[shop=shoes],
+node[shop=sports],
+node[shop=stationery],
+node[shop=supermarket],
+node[shop=ticket],
+node[shop=tobacco],
+node[shop=toys],
+node[shop=variety_store],
+node[shop=video],
+node[shop=video_games],
+node[shop=wine],
+node[shop],
+{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=car_wash],
+node[amenity=fuel],
+node[amenity=studio],
+node[amenity=vehicle_inspection],
+node[craft=beekeeper],
+node[craft=blacksmith],
+node[craft=carpenter],
+node[craft=caterer],
+node[craft=electrician],
+node[craft=electronics_repair],
+node[craft=grinding_mill],
+node[craft=handicraft],
+node[craft=hvac],
+node[craft=key_cutter],
+node[craft=locksmith],
+node[craft=metal_construction],
+node[craft=painter],
+node[craft=plumber],
+node[craft=sawmill],
+node[craft],
+node[landuse=industrial][industrial=mine],
+node[landuse=quarry],
+node[man_made=works],
+node[office],
+node[shop=agrarian],
+node[shop=car_parts],
+node[shop=car_repair],
+node[shop=car_repair][service=tyres],
+node[shop=funeral_directors],
+node[shop=gas],
+node[shop=motorcycle_repair],
+node[shop=tattoo],
+node[shop=trade],
+node[shop=tyres],
+node[shop=wholesale],
+{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bar],
+node[amenity=biergarten],
+node[amenity=cafe],
+node[amenity=fast_food],
+node[amenity=food_court],
+node[amenity=ice_cream],
+node[amenity=nightclub],
+node[amenity=pub],
+node[amenity=restaurant],
+{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=casino],
+node[amenity=cinema],
+node[amenity=gambling],
+node[amenity=stripclub],
+node[amenity=theatre],
+node[leisure=adult_gaming_centre],
+node[leisure=amusement_arcade],
+node[leisure=bowling_alley],
+node[leisure=escape_game],
+node[shop=bookmaker],
+node[shop=lottery],
+node[tourism=aquarium],
+node[tourism=theme_park],
+node[tourism=zoo],
+{text-color: @entertainment_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=arts_centre],
+node[amenity=community_centre],
+node[amenity=conference_centre],
+node[amenity=events_venue],
+node[amenity=exhibition_centre],
+node[amenity=place_of_worship]
+node[amenity=social_facility],
+node[historic=ship],
+node[leisure=hackerspace],
+node[tourism=attraction],
+node[tourism=gallery],
+node[tourism=museum],
+{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[leisure=resort],
+node[tourism=alpine_hut],
+node[tourism=apartment],
+node[tourism=chalet],
+node[tourism=guest_house],
+node[tourism=hostel],
+node[tourism=hotel],
+node[tourism=motel],
+node[tourism=wilderness_hut],
+{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[leisure=dance],
+node[leisure=fitness_centre],
+node[leisure=sports_centre],
+node[leisure=stadium],
+{text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[landuse=plant_nursery],
+{text-color: @nature_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=public_bath],
+node[leisure=beach_resort],
+node[leisure=marina],
+node[leisure=sports_centre][sport=scuba_diving],
+node[leisure=sports_centre][sport=swimming],
+node[shop=massage],
+{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;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=fire_station],
+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[building=guardhouse],
+node[office=security],
+node[shop=money_lender],
+node[tourism=information][information=office],
+{text-color: @neutral_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;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.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bicycle_rental],
+node[amenity=taxi],
+{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}