Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 19026)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 19169)
@@ -413,4 +413,14 @@
     icon-image: "presets/barrier/gate.svg";
     set icon_z17;
+}
+way[barrier=gate],
+way[barrier=lift_gate],
+way[barrier=swing_gate],
+way[barrier=hampshire_gate],
+way[barrier=bump_gate],
+way[barrier=kissing_gate],
+way[barrier=wicket_gate] {
+    width: 2;
+    color: barrier-opening#88F050;
 }
 way[barrier=yes],
@@ -502,4 +512,8 @@
     set icon_z17;
 }
+node[barrier=wicket_gate] {
+    icon-image: "presets/barrier/wicket_gate.svg";
+    set icon_z17;
+}
 node[barrier=height_restrictor] {
     icon-image: "presets/barrier/height_restrictor.svg";
@@ -616,5 +630,6 @@
     color: street#c0c0c0;
 }
-way[highway=escape] {
+way[highway=escape],
+way[highway=emergency_bay] {
     width: 3;
     color: street#c0c0c0;
@@ -830,5 +845,6 @@
     set icon_z17;
 }
-node[highway=crossing][crossing=unmarked] {
+node[highway=crossing][crossing=unmarked],
+node[highway=crossing][crossing=informal] {
     icon-image: "presets/vehicle/crossing_unmarked.svg";
     set icon_z17;
@@ -947,4 +963,8 @@
 node[highway=passing_place] {
     icon-image: "presets/vehicle/passing_place.svg";
+    set icon_z17;
+}
+node[highway=emergency_bay] {
+    icon-image: "presets/vehicle/emergency_bay.svg";
     set icon_z17;
 }
@@ -2378,4 +2398,5 @@
 area[shop=pastry],
 area[shop=copyshop],
+area[shop=craft],
 area[shop=curtain],
 area[shop=cycle_repair],
@@ -2454,4 +2475,5 @@
 area[shop=weapons],
 area[shop=funeral_directors],
+area[shop=agrarian],
 area[shop=wine],
 area[shop=farm],
@@ -2566,4 +2588,8 @@
     set icon_z17;
 }
+node[shop=craft] {
+    icon-image: "presets/shop/craft.svg";
+    set icon_z17;
+}
 node[shop=curtain] {
     icon-image: "presets/shop/curtain.svg";
@@ -2868,4 +2894,8 @@
 node[shop=funeral_directors] {
     icon-image: "presets/shop/funeral_directors.svg";
+    set icon_z17;
+}
+node[shop=agrarian] {
+    icon-image: "presets/shop/agrarian.svg";
     set icon_z17;
 }
@@ -3082,4 +3112,7 @@
     fill-color: parking_space#f7efb8;
 }
+area[amenity=trolley_bay] {
+    fill-color: trolley_bay#b8d8f7;
+}
 area[amenity=parking],
 area[amenity=motorcycle_parking],
@@ -3097,4 +3130,8 @@
 node[amenity=parking_space] {
     icon-image: "presets/vehicle/parking/parking_space.svg";
+    set icon_z17;
+}
+node[amenity=trolley_bay] {
+    icon-image: "presets/vehicle/parking/trolley_bay.svg";
     set icon_z17;
 }
@@ -3277,4 +3314,5 @@
 area[amenity=kindergarten],
 area[amenity=language_school],
+area[amenity=music_school],
 area[amenity=driving_school] {
     fill-color: amenity_light#f7efb7;
@@ -3406,4 +3444,8 @@
 node[amenity=driving_school] {
     icon-image: "presets/education/driving_school.svg";
+    set icon_z17;
+}
+node[amenity=music_school] {
+    icon-image: "presets/education/music_school.svg";
     set icon_z17;
 }
@@ -4754,4 +4796,12 @@
 node[sport=climbing] {
     icon-image: "presets/sport/climbing.svg";
+    set icon_z17;
+}
+node[climbing=route_bottom] {
+    icon-image: "presets/sport/climbing_route_bottom.svg";
+    set icon_z17;
+}
+node[climbing=route_top] {
+    icon-image: "presets/sport/climbing_route_top.svg";
     set icon_z17;
 }