--- styles/standard/elemstyles.mapcss
+++ styles/standard/elemstyles.mapcss
@@ -3317,691 +3317,691 @@
     text: auto;
 }
 
-/****************/
-/* natural tags */
-/****************/
+/**************/
+/* sport tags */
+/**************/
 
-area[natural=spring] {
-    fill-color: light_water#00005f;
+area[sport="9pin"],
+area[sport="10pin"],
+area[sport=athletics],
+area[sport=soccer],
+area[sport=australian_football],
+area[sport=american_football],
+area[sport=canadian_football],
+area[sport=gaelic_football],
+area[sport=rugby_league],
+area[sport=rugby_union] {
+    fill-color: sport#bde3cb;
 }
-node[natural=spring] {
-    icon-image: "misc/landmark/spring.png";
+node[sport="9pin"] {
+    icon-image: "sport/10pin.png";
     set icon_z17;
     text: auto;
 }
-node[natural=saddle] {
-    icon-image: "presets/saddle.svg";
-    set icon_z0;
+node[sport="10pin"] {
+    icon-image: "sport/10pin.png";
+    set icon_z17;
     text: auto;
-    set text_z0;
-}
-area[natural=peak] {
-    fill-color: peak#663300;
 }
-node[natural=peak] {
-    icon-image: "presets/peak.svg";
-    set icon_z0;
+node[sport=athletics] {
+    icon-image: "sport/athletics.png";
+    set icon_z17;
     text: auto;
-    set text_z0;
 }
-node[natural=peak][tourism=viewpoint] {
-    icon-image: "sightseeing/peak_viewpoint.svg";
-    set icon_z0;
+node[sport=soccer],
+node[sport=australian_football],
+node[sport=american_football],
+node[sport=canadian_football],
+node[sport=gaelic_football] {
+    icon-image: "sport/soccer.png";
+    set icon_z17;
     text: auto;
-    set text_z0;
-}
-area[natural=glacier] {
-    fill-color: glacier#ffffff;
 }
-node[natural=glacier] {
-    icon-image: "misc/landmark/glacier_small.png";
-    set icon_z0;
+node[sport=rugby_league],
+node[sport=rugby_union] {
+    icon-image: "sport/football.png";
+    set icon_z17;
     text: auto;
-    set text_z0;
 }
-area[natural=volcano] {
-    fill-color: volcano#5f0000;
+area[sport=baseball],
+area[sport=basketball],
+area[sport=boules],
+area[sport=bowls],
+area[sport=canoe],
+area[sport=chess],
+area[sport=climbing]:closed,
+area[sport=cricket],
+area[sport=cricket_nets],
+area[sport=croquet] {
+    fill-color: sport#bde3cb;
 }
-node[natural=volcano] {
-    icon-image: "misc/landmark/volcano_small.png";
-    set icon_z0;
+node[sport=baseball] {
+    icon-image: "sport/baseball.png";
+    set icon_z17;
     text: auto;
-    set text_z0;
-}
-area[natural=cliff]:closed {
-    fill-color: natural#002f00;
-}
-way[natural=cliff] {
-    repeat-image: "misc/cliff-pattern.png";
-    repeat-image-align: top;
-    width: 1;
-    color: #b2b2b2;
 }
-node[natural=cliff] {
-    icon-image: "misc/cliff.png";
+node[sport=basketball] {
+    icon-image: "sport/basketball.png";
     set icon_z17;
     text: auto;
 }
-area[natural=scree] {
-    fill-color: natural#002f00;
-}
-node[natural=scree] {
-    icon-image: "misc/no_icon.png";
+node[sport=boules] {
+    icon-image: "sport/boule.png";
     set icon_z17;
     text: auto;
 }
-area[natural=scrub] {
-    fill-color: scrub#007000;
-}
-node[natural=scrub] {
-    icon-image: "presets/scrub.svg";
+node[sport=bowls] {
+    icon-image: "sport/boule.png";
     set icon_z17;
     text: auto;
 }
-area[natural=fell] {
-    fill-color: natural#002f00;
-}
-node[natural=fell] {
-    icon-image: "misc/no_icon.png";
+node[sport=canoe] {
+    icon-image: "sport/canoe.png";
     set icon_z17;
     text: auto;
 }
-area[natural=heath] {
-    fill-color: heath#ffffc0;
-}
-node[natural=heath] {
-    icon-image: "misc/no_icon.png";
+node[sport=chess] {
+    icon-image: "sport/chess.png";
     set icon_z17;
     text: auto;
 }
-way[natural=tree_row] {
-    width: 2;
-    color: woodarea#008000;
-}
-node[natural=tree_row] {
-    icon-image: "misc/no_icon.png";
+node[sport=climbing] {
+    icon-image: "sport/climbing.png";
     set icon_z17;
     text: auto;
 }
-area[natural=wood] {
-    fill-color: woodarea#008000;
-}
-node[natural=wood] {
-    icon-image: "misc/landmark/trees.png";
+node[sport=cricket] {
+    icon-image: "sport/cricket.png";
     set icon_z17;
     text: auto;
 }
-area[natural=grassland] {
-    fill-color: green#b1e0c2;
-}
-node[natural=grassland] {
+node[sport=cricket_nets] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-area[natural=wetland] {
-    fill-color: marsh#4f4ff3;
-}
-node[natural=wetland] {
-    icon-image: "misc/no_icon.png";
+node[sport=croquet] {
+    icon-image: "sport/croquet.png";
     set icon_z17;
     text: auto;
 }
-area[natural=water] {
-    fill-color: water#0000ff;
+area[sport=cycling],
+area[sport=dog_racing],
+area[sport=equestrian],
+area[sport=golf],
+area[sport=gymnastics],
+area[sport=hockey],
+area[sport=horse_racing],
+area[sport=karting],
+area[sport=motocross],
+area[sport=motor] {
+    fill-color: sport#bde3cb;
 }
-node[natural=water] {
-    icon-image: "nautical/water.png";
+node[sport=cycling] {
+    icon-image: "sport/cycling.png";
     set icon_z17;
     text: auto;
 }
-way[natural=coastline] {
-    width: 1;
-    color: water#0000ff;
-}
-node[natural=coastline] {
-    icon-image: "misc/coastline.png";
+node[sport=dog_racing] {
+    icon-image: "leisure/dog.png";
     set icon_z17;
     text: auto;
 }
-area[natural=mud] {
-    fill-color: mud#cba762;
+node[sport=equestrian] {
+    icon-image: "sport/riding.png";
+    set icon_z17;
+    text: auto;
 }
-node[natural=mud] {
-    icon-image: "misc/mud.png";
+node[sport=golf] {
+    icon-image: "sport/golf.png";
     set icon_z17;
     text: auto;
 }
-area[natural=beach] {
-    fill-color: beach#f8dba2;
+node[sport=gymnastics] {
+    icon-image: "sport/multi.png";
+    set icon_z17;
+    text: auto;
 }
-node[natural=beach] {
-    icon-image: "misc/beach.png";
+node[sport=hockey] {
+    icon-image: "sport/hockey.png";
     set icon_z17;
     text: auto;
 }
-area[natural=sand] {
-    fill-color: sand#f8dba2;
+node[sport=horse_racing] {
+    icon-image: "sport/riding.png";
+    set icon_z17;
+    text: auto;
 }
-node[natural=sand] {
-    icon-image: "misc/no_icon.png";
+node[sport=karting] {
+    icon-image: "sport/karting.png";
     set icon_z17;
     text: auto;
 }
-area[natural=bay],
-area[natural=land],
-area[natural=cave_entrance] {
-    fill-color: natural#002f00;
+node[sport=motocross] {
+    icon-image: "sport/motocross.png";
+    set icon_z17;
+    text: auto;
 }
-node[natural=bay] {
-    icon-image: "misc/bay.png";
+node[sport=motor] {
+    icon-image: "sport/motor.png";
     set icon_z17;
     text: auto;
 }
-node[natural=land] {
-    icon-image: "misc/no_icon.png";
+area[sport=multi],
+area[sport=pelota],
+area[sport=racquet],
+area[sport=skating],
+area[sport=skateboard] {
+    fill-color: sport#bde3cb;
+}
+node[sport=multi] {
+    icon-image: "sport/multi.png";
     set icon_z17;
     text: auto;
 }
-node[natural=cave_entrance] {
-    icon-image: "misc/landmark/cave_entrance.png";
+node[sport=pelota] {
+    icon-image: "sport/pelota.png";
     set icon_z17;
     text: auto;
 }
-node[natural=tree] {
-    icon-image: "misc/landmark/trees.png";
+node[sport=racquet] {
+    icon-image: "sport/racquetball.png";
     set icon_z17;
     text: auto;
 }
-node[natural=tree][type=conifer],
-node[natural=tree][leaf_type=needleleaved] {
-    icon-image: "misc/landmark/trees_conifer.png";
+node[sport=skating] {
+    icon-image: "sport/skating.png";
     set icon_z17;
     text: auto;
 }
-node[natural=tree][type=broad_leaved],
-node[natural=tree][leaf_type=broadleaved] {
-    icon-image: "misc/landmark/trees_broad_leaved.png";
+node[sport=skateboard] {
+    icon-image: "sport/skateboard.png";
     set icon_z17;
     text: auto;
 }
-node[natural=tree][type=palm] {
-    icon-image: "misc/landmark/trees_palm.png";
+area[sport=swimming] {
+    fill-color: swimming_pool#51c4ef;
+}
+node[sport=swimming] {
+    icon-image: "sport/pool.png";
     set icon_z17;
     text: auto;
 }
-
-/*****************/
-/* waterway tags */
-/*****************/
-
-way[waterway=river] {
-    width: 2;
-    color: water#0000ff;
-}
-area[waterway=riverbank] {
-    fill-color: riverbank#0000cf;
-    width: 1;
-    color: riverbank#0000cf;
-}
-way[waterway=canal], way[waterway=wadi] {
-    width: 2;
-    color: water#0000ff;
-}
-way[waterway=stream] {
-    width: 1;
-    color: stream#6600cc;
-}
-way[waterway=ditch], way[waterway=drain] {
-    width: 1;
-    color: water#0000ff;
+area[sport=skiing],
+area[sport=table_tennis],
+area[sport=tennis],
+area[sport=paintball] {
+    fill-color: sport#bde3cb;
 }
-area[waterway=dock] {
-    fill-color: dock#0000cf;
+node[sport=skiing] {
+    icon-image: "sport/skiing.png";
+    set icon_z17;
+    text: auto;
 }
-node[waterway=dock] {
-    icon-image: "nautical/boatyard.png";
+node[sport=table_tennis] {
+    icon-image: "sport/table_tennis.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=lock_gate] {
-    icon-image: "nautical/lock_gate.png";
+node[sport=tennis] {
+    icon-image: "sport/tennis.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=turning_point] {
-    icon-image: "nautical/turning.png";
+node[sport=paintball] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-area[waterway=boatyard] {
-    fill-color: manmade#d8d8d8;
+area[sport=squash],
+area[sport=shooting],
+area[sport=volleyball],
+area[sport=beachvolleyball],
+area[sport=bowling],
+area[sport=handball],
+area[sport=rowing],
+area[sport=sailing],
+area[sport=diving],
+area[sport=badminton] {
+    fill-color: sport#bde3cb;
 }
-node[waterway=boatyard] {
-    icon-image: "nautical/boatyard.png";
+node[sport=squash] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=water_point] {
-    icon-image: "accommodation/camping/water.png";
+node[sport=shooting] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=waste_disposal] {
-    icon-image: "accommodation/camping/wastewater.png";
+node[sport=volleyball] {
+    icon-image: "sport/volleyball.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=mooring] {
-    icon-image: "nautical/marina.png";
+node[sport=beachvolleyball] {
+    icon-image: "sport/beachvolleyball.png";
     set icon_z17;
     text: auto;
 }
-way[waterway=weir] {
-    width: 2;
-    color: manmade#d8d8d8;
-}
-node[waterway=weir] {
-    icon-image: "nautical/weir.png";
+node[sport=bowling] {
+    icon-image: "sport/10pin.png";
     set icon_z17;
     text: auto;
 }
-way[waterway=rapids] {
-    width: 2;
-    color: rapids#8080ff;
-}
-node[waterway=rapids] {
-    icon-image: "misc/no_icon.png";
+node[sport=handball] {
+    icon-image: "sport/handball.png";
     set icon_z17;
     text: auto;
 }
-area[waterway=dam]:closed {
-    fill-color: manmade#d8d8d8;
-}
-way[waterway=dam] {
-    width: 2;
-    color: manmade#d8d8d8;
-}
-node[waterway=dam] {
-    icon-image: "nautical/dam.png";
+node[sport=rowing] {
+    icon-image: "sport/rowing.png";
     set icon_z17;
     text: auto;
 }
-/* it's not possible to have both line and area, line seems more likely */
-way[waterway=waterfall] {
-    width: 2;
-    color: manmade#d8d8d8;
-}
-node[waterway=waterfall] {
-    icon-image: "nautical/waterfall.png";
+node[sport=sailing] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=river], node[waterway=riverbank],
-node[waterway=canal], node[waterway=wadi],
-node[waterway=stream],
-node[waterway=ditch], node[waterway=drain] {
-    icon-image: "misc/deprecated.png";
+node[sport=diving] {
+    icon-image: "sport/diving.png";
     set icon_z17;
     text: auto;
 }
-
-/**************/
-/* route tags */
-/**************/
-
-way[route=bus],
-way[route=ferry],
-way[route=flight],
-way[route=ncn],
-way[route=subsea],
-way[route=ski],
-way[route=tour],
-way[route=pub_crawl] {
-    width: 1;
-    color: route#809bc0;
-    dashes: 9,9;
-}
-node[route=bus],
-node[route=ferry],
-node[route=flight],
-node[route=ncn],
-node[route=subsea],
-node[route=ski],
-node[route=tour],
-node[route=pub_crawl] {
-    icon-image: "misc/deprecated.png";
+node[sport=badminton] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-
-/**************/
-/* sport tags */
-/**************/
-
-area[sport="9pin"],
-area[sport="10pin"],
-area[sport=athletics],
-area[sport=soccer],
-area[sport=australian_football],
-area[sport=american_football],
-area[sport=canadian_football],
-area[sport=gaelic_football],
-area[sport=rugby_league],
-area[sport=rugby_union] {
+area[sport=archery],
+area[sport=fishing],
+area[sport=safety_training],
+area[sport=model_aerodrome],
+area[sport=rc_car] {
     fill-color: sport#bde3cb;
 }
-node[sport="9pin"] {
-    icon-image: "sport/10pin.png";
+node[sport=archery] {
+    icon-image: "sport/archery.png";
     set icon_z17;
     text: auto;
 }
-node[sport="10pin"] {
-    icon-image: "sport/10pin.png";
+node[sport=fishing] {
+    icon-image: "sport/fishing.png";
     set icon_z17;
     text: auto;
 }
-node[sport=athletics] {
-    icon-image: "sport/athletics.png";
+node[sport=safety_training] {
+    icon-image: "sport/safety_training.png";
     set icon_z17;
     text: auto;
 }
-node[sport=soccer],
-node[sport=australian_football],
-node[sport=american_football],
-node[sport=canadian_football],
-node[sport=gaelic_football] {
-    icon-image: "sport/soccer.png";
+node[sport=model_aerodrome] {
+    icon-image: "transport/airport.png";
     set icon_z17;
     text: auto;
 }
-node[sport=rugby_league],
-node[sport=rugby_union] {
-    icon-image: "sport/football.png";
+node[sport=rc_car] {
+    icon-image: "transport/car.png";
     set icon_z17;
     text: auto;
 }
-area[sport=baseball],
-area[sport=basketball],
-area[sport=boules],
-area[sport=bowls],
-area[sport=canoe],
-area[sport=chess],
-area[sport=climbing]:closed,
-area[sport=cricket],
-area[sport=cricket_nets],
-area[sport=croquet] {
-    fill-color: sport#bde3cb;
+
+/****************/
+/* natural tags */
+/****************/
+
+area[natural=spring] {
+    fill-color: light_water#00005f;
 }
-node[sport=baseball] {
-    icon-image: "sport/baseball.png";
+node[natural=spring] {
+    icon-image: "misc/landmark/spring.png";
     set icon_z17;
     text: auto;
 }
-node[sport=basketball] {
-    icon-image: "sport/basketball.png";
-    set icon_z17;
+node[natural=saddle] {
+    icon-image: "presets/saddle.svg";
+    set icon_z0;
     text: auto;
+    set text_z0;
 }
-node[sport=boules] {
-    icon-image: "sport/boule.png";
-    set icon_z17;
-    text: auto;
+area[natural=peak] {
+    fill-color: peak#663300;
 }
-node[sport=bowls] {
-    icon-image: "sport/boule.png";
-    set icon_z17;
+node[natural=peak] {
+    icon-image: "presets/peak.svg";
+    set icon_z0;
     text: auto;
+    set text_z0;
 }
-node[sport=canoe] {
-    icon-image: "sport/canoe.png";
-    set icon_z17;
+node[natural=peak][tourism=viewpoint] {
+    icon-image: "sightseeing/peak_viewpoint.svg";
+    set icon_z0;
     text: auto;
+    set text_z0;
 }
-node[sport=chess] {
-    icon-image: "sport/chess.png";
-    set icon_z17;
+area[natural=glacier] {
+    fill-color: glacier#ffffff;
+}
+node[natural=glacier] {
+    icon-image: "misc/landmark/glacier_small.png";
+    set icon_z0;
     text: auto;
+    set text_z0;
 }
-node[sport=climbing] {
-    icon-image: "sport/climbing.png";
-    set icon_z17;
+area[natural=volcano] {
+    fill-color: volcano#5f0000;
+}
+node[natural=volcano] {
+    icon-image: "misc/landmark/volcano_small.png";
+    set icon_z0;
     text: auto;
+    set text_z0;
 }
-node[sport=cricket] {
-    icon-image: "sport/cricket.png";
+area[natural=cliff]:closed {
+    fill-color: natural#002f00;
+}
+way[natural=cliff] {
+    repeat-image: "misc/cliff-pattern.png";
+    repeat-image-align: top;
+    width: 1;
+    color: #b2b2b2;
+}
+node[natural=cliff] {
+    icon-image: "misc/cliff.png";
     set icon_z17;
     text: auto;
 }
-node[sport=cricket_nets] {
+area[natural=scree] {
+    fill-color: natural#002f00;
+}
+node[natural=scree] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=croquet] {
-    icon-image: "sport/croquet.png";
+area[natural=scrub] {
+    fill-color: scrub#007000;
+}
+node[natural=scrub] {
+    icon-image: "presets/scrub.svg";
     set icon_z17;
     text: auto;
 }
-area[sport=cycling],
-area[sport=dog_racing],
-area[sport=equestrian],
-area[sport=golf],
-area[sport=gymnastics],
-area[sport=hockey],
-area[sport=horse_racing],
-area[sport=karting],
-area[sport=motocross],
-area[sport=motor] {
-    fill-color: sport#bde3cb;
+area[natural=fell] {
+    fill-color: natural#002f00;
 }
-node[sport=cycling] {
-    icon-image: "sport/cycling.png";
+node[natural=fell] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=dog_racing] {
-    icon-image: "leisure/dog.png";
-    set icon_z17;
-    text: auto;
+area[natural=heath] {
+    fill-color: heath#ffffc0;
 }
-node[sport=equestrian] {
-    icon-image: "sport/riding.png";
+node[natural=heath] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=golf] {
-    icon-image: "sport/golf.png";
-    set icon_z17;
-    text: auto;
+way[natural=tree_row] {
+    width: 2;
+    color: woodarea#008000;
 }
-node[sport=gymnastics] {
-    icon-image: "sport/multi.png";
+node[natural=tree_row] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=hockey] {
-    icon-image: "sport/hockey.png";
+area[natural=wood] {
+    fill-color: woodarea#008000;
+}
+node[natural=wood] {
+    icon-image: "misc/landmark/trees.png";
     set icon_z17;
     text: auto;
 }
-node[sport=horse_racing] {
-    icon-image: "sport/riding.png";
+area[natural=grassland] {
+    fill-color: green#b1e0c2;
+}
+node[natural=grassland] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=karting] {
-    icon-image: "sport/karting.png";
+area[natural=wetland] {
+    fill-color: marsh#4f4ff3;
+}
+node[natural=wetland] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=motocross] {
-    icon-image: "sport/motocross.png";
+area[natural=water] {
+    fill-color: water#0000ff;
+}
+node[natural=water] {
+    icon-image: "nautical/water.png";
     set icon_z17;
     text: auto;
 }
-node[sport=motor] {
-    icon-image: "sport/motor.png";
+way[natural=coastline] {
+    width: 1;
+    color: water#0000ff;
+}
+node[natural=coastline] {
+    icon-image: "misc/coastline.png";
     set icon_z17;
     text: auto;
 }
-area[sport=multi],
-area[sport=pelota],
-area[sport=racquet],
-area[sport=skating],
-area[sport=skateboard] {
-    fill-color: sport#bde3cb;
+area[natural=mud] {
+    fill-color: mud#cba762;
 }
-node[sport=multi] {
-    icon-image: "sport/multi.png";
+node[natural=mud] {
+    icon-image: "misc/mud.png";
     set icon_z17;
     text: auto;
 }
-node[sport=pelota] {
-    icon-image: "sport/pelota.png";
+area[natural=beach] {
+    fill-color: beach#f8dba2;
+}
+node[natural=beach] {
+    icon-image: "misc/beach.png";
     set icon_z17;
     text: auto;
 }
-node[sport=racquet] {
-    icon-image: "sport/racquetball.png";
+area[natural=sand] {
+    fill-color: sand#f8dba2;
+}
+node[natural=sand] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[sport=skating] {
-    icon-image: "sport/skating.png";
+area[natural=bay],
+area[natural=land],
+area[natural=cave_entrance] {
+    fill-color: natural#002f00;
+}
+node[natural=bay] {
+    icon-image: "misc/bay.png";
     set icon_z17;
     text: auto;
 }
-node[sport=skateboard] {
-    icon-image: "sport/skateboard.png";
+node[natural=land] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-area[sport=swimming] {
-    fill-color: swimming_pool#51c4ef;
-}
-node[sport=swimming] {
-    icon-image: "sport/pool.png";
+node[natural=cave_entrance] {
+    icon-image: "misc/landmark/cave_entrance.png";
     set icon_z17;
     text: auto;
 }
-area[sport=skiing],
-area[sport=table_tennis],
-area[sport=tennis],
-area[sport=paintball] {
-    fill-color: sport#bde3cb;
-}
-node[sport=skiing] {
-    icon-image: "sport/skiing.png";
+node[natural=tree] {
+    icon-image: "misc/landmark/trees.png";
     set icon_z17;
     text: auto;
 }
-node[sport=table_tennis] {
-    icon-image: "sport/table_tennis.png";
+node[natural=tree][type=conifer],
+node[natural=tree][leaf_type=needleleaved] {
+    icon-image: "misc/landmark/trees_conifer.png";
     set icon_z17;
     text: auto;
 }
-node[sport=tennis] {
-    icon-image: "sport/tennis.png";
+node[natural=tree][type=broad_leaved],
+node[natural=tree][leaf_type=broadleaved] {
+    icon-image: "misc/landmark/trees_broad_leaved.png";
     set icon_z17;
     text: auto;
 }
-node[sport=paintball] {
-    icon-image: "misc/no_icon.png";
+node[natural=tree][type=palm] {
+    icon-image: "misc/landmark/trees_palm.png";
     set icon_z17;
     text: auto;
 }
-area[sport=squash],
-area[sport=shooting],
-area[sport=volleyball],
-area[sport=beachvolleyball],
-area[sport=bowling],
-area[sport=handball],
-area[sport=rowing],
-area[sport=sailing],
-area[sport=diving],
-area[sport=badminton] {
-    fill-color: sport#bde3cb;
+
+/*****************/
+/* waterway tags */
+/*****************/
+
+way[waterway=river] {
+    width: 2;
+    color: water#0000ff;
 }
-node[sport=squash] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
+area[waterway=riverbank] {
+    fill-color: riverbank#0000cf;
+    width: 1;
+    color: riverbank#0000cf;
 }
-node[sport=shooting] {
-    icon-image: "misc/no_icon.png";
+way[waterway=canal], way[waterway=wadi] {
+    width: 2;
+    color: water#0000ff;
+}
+way[waterway=stream] {
+    width: 1;
+    color: stream#6600cc;
+}
+way[waterway=ditch], way[waterway=drain] {
+    width: 1;
+    color: water#0000ff;
+}
+area[waterway=dock] {
+    fill-color: dock#0000cf;
+}
+node[waterway=dock] {
+    icon-image: "nautical/boatyard.png";
     set icon_z17;
     text: auto;
 }
-node[sport=volleyball] {
-    icon-image: "sport/volleyball.png";
+node[waterway=lock_gate] {
+    icon-image: "nautical/lock_gate.png";
     set icon_z17;
     text: auto;
 }
-node[sport=beachvolleyball] {
-    icon-image: "sport/beachvolleyball.png";
+node[waterway=turning_point] {
+    icon-image: "nautical/turning.png";
     set icon_z17;
     text: auto;
 }
-node[sport=bowling] {
-    icon-image: "sport/10pin.png";
+area[waterway=boatyard] {
+    fill-color: manmade#d8d8d8;
+}
+node[waterway=boatyard] {
+    icon-image: "nautical/boatyard.png";
     set icon_z17;
     text: auto;
 }
-node[sport=handball] {
-    icon-image: "sport/handball.png";
+node[waterway=water_point] {
+    icon-image: "accommodation/camping/water.png";
     set icon_z17;
     text: auto;
 }
-node[sport=rowing] {
-    icon-image: "sport/rowing.png";
+node[waterway=waste_disposal] {
+    icon-image: "accommodation/camping/wastewater.png";
     set icon_z17;
     text: auto;
 }
-node[sport=sailing] {
-    icon-image: "misc/no_icon.png";
+node[waterway=mooring] {
+    icon-image: "nautical/marina.png";
     set icon_z17;
     text: auto;
 }
-node[sport=diving] {
-    icon-image: "sport/diving.png";
+way[waterway=weir] {
+    width: 2;
+    color: manmade#d8d8d8;
+}
+node[waterway=weir] {
+    icon-image: "nautical/weir.png";
     set icon_z17;
     text: auto;
 }
-node[sport=badminton] {
+way[waterway=rapids] {
+    width: 2;
+    color: rapids#8080ff;
+}
+node[waterway=rapids] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-area[sport=archery],
-area[sport=fishing],
-area[sport=safety_training],
-area[sport=model_aerodrome],
-area[sport=rc_car] {
-    fill-color: sport#bde3cb;
+area[waterway=dam]:closed {
+    fill-color: manmade#d8d8d8;
 }
-node[sport=archery] {
-    icon-image: "sport/archery.png";
-    set icon_z17;
-    text: auto;
+way[waterway=dam] {
+    width: 2;
+    color: manmade#d8d8d8;
 }
-node[sport=fishing] {
-    icon-image: "sport/fishing.png";
+node[waterway=dam] {
+    icon-image: "nautical/dam.png";
     set icon_z17;
     text: auto;
 }
-node[sport=safety_training] {
-    icon-image: "sport/safety_training.png";
+/* it's not possible to have both line and area, line seems more likely */
+way[waterway=waterfall] {
+    width: 2;
+    color: manmade#d8d8d8;
+}
+node[waterway=waterfall] {
+    icon-image: "nautical/waterfall.png";
     set icon_z17;
     text: auto;
 }
-node[sport=model_aerodrome] {
-    icon-image: "transport/airport.png";
+node[waterway=river], node[waterway=riverbank],
+node[waterway=canal], node[waterway=wadi],
+node[waterway=stream],
+node[waterway=ditch], node[waterway=drain] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;
 }
-node[sport=rc_car] {
-    icon-image: "transport/car.png";
+
+/**************/
+/* route tags */
+/**************/
+
+way[route=bus],
+way[route=ferry],
+way[route=flight],
+way[route=ncn],
+way[route=subsea],
+way[route=ski],
+way[route=tour],
+way[route=pub_crawl] {
+    width: 1;
+    color: route#809bc0;
+    dashes: 9,9;
+}
+node[route=bus],
+node[route=ferry],
+node[route=flight],
+node[route=ncn],
+node[route=subsea],
+node[route=ski],
+node[route=tour],
+node[route=pub_crawl] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;
 }