Index: /trunk/nodist/styles/potlatch2/README
===================================================================
--- /trunk/nodist/styles/potlatch2/README	(revision 17015)
+++ /trunk/nodist/styles/potlatch2/README	(revision 17016)
@@ -17,3 +17,3 @@
 When updating from upstream, keep all 4 locations in sync.
 
-At time of writing, the last update used 0a21b8bca71f6105c244cb52d7b7dcb5a840bd3a (2014-10-07) but better check the commit dates as well.
+At time of writing, the last update used 28c84372002671c8d71a81a2e423f4965388edd7 (2019-06-21) but better check the commit dates as well.
Index: /trunk/nodist/styles/potlatch2/patched/core_pois.css
===================================================================
--- /trunk/nodist/styles/potlatch2/patched/core_pois.css	(revision 17015)
+++ /trunk/nodist/styles/potlatch2/patched/core_pois.css	(revision 17016)
@@ -41,4 +41,5 @@
 node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
 node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
 node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
 node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
@@ -47,4 +48,5 @@
 node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
 node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
+node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
 node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
 node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
@@ -54,5 +56,5 @@
 node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
 node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
-node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
+node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
 node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
 node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
@@ -60,5 +62,4 @@
 node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
 node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
-node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 /* Shops */
Index: /trunk/nodist/styles/potlatch2/source/core_landuse.css
===================================================================
--- /trunk/nodist/styles/potlatch2/source/core_landuse.css	(revision 17015)
+++ /trunk/nodist/styles/potlatch2/source/core_landuse.css	(revision 17016)
@@ -40,4 +40,4 @@
 way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
 way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
-way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: #664466; opacity: 0.2; set .area_small_name;}
+way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
Index: /trunk/nodist/styles/potlatch2/source/core_pois.css
===================================================================
--- /trunk/nodist/styles/potlatch2/source/core_pois.css	(revision 17015)
+++ /trunk/nodist/styles/potlatch2/source/core_pois.css	(revision 17016)
@@ -34,4 +34,5 @@
 node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
 node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
 node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
 node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
@@ -40,4 +41,5 @@
 node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
 node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
+node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
 node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
 node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
@@ -47,5 +49,5 @@
 node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
 node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
-node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
+node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
 node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
 node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
@@ -53,5 +55,4 @@
 node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
 node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
-node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 /* Shops */
Index: /trunk/nodist/styles/potlatch2/source/core_ways.css
===================================================================
--- /trunk/nodist/styles/potlatch2/source/core_ways.css	(revision 17015)
+++ /trunk/nodist/styles/potlatch2/source/core_ways.css	(revision 17016)
@@ -70,10 +70,10 @@
 way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
 
-/* Waterways */ 
+/* Waterways */	
 
 way[waterway=river], 
 way[waterway=canal], 
 way[waterway=stream]   { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;}
-way[waterway=drain]              {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
+way[waterway=drain] 			 {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
 way[waterway][tunnel=yes]                {dashes: 8,4;}
 
Index: /trunk/resources/styles/standard/potlatch2.mapcss
===================================================================
--- /trunk/resources/styles/standard/potlatch2.mapcss	(revision 17015)
+++ /trunk/resources/styles/standard/potlatch2.mapcss	(revision 17016)
@@ -216,4 +216,5 @@
 node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
 node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
 node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
 node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
@@ -222,4 +223,5 @@
 node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
 node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
+node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
 node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
 node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
@@ -229,5 +231,5 @@
 node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
 node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
-node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
+node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
 node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
 node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
@@ -235,5 +237,4 @@
 node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
 node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
-node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 /* Shops */