From: Tom Hughes <tom@compton.nu>
Date: Sun, 25 Mar 2012 22:15:19 +0000 (+0100)
Subject: Load Potlatch 2 through the asset pipeline
X-Git-Tag: live~6183
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c7b3ba447f8fa06ae4441f9ba2c76085347257ea

Load Potlatch 2 through the asset pipeline
---

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 0b1c0e34d..95a52368e 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -28,7 +28,10 @@
     if (lat) { flashvars.lat = lat; }
     if (lon) { flashvars.lon = lon; }
     flashvars.zoom = zoom;
+    flashvars.assets = "<%= asset_path "potlatch2/assets.zip" %>";
+    flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";
     flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
+    flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";
     <% if params['gpx'] %>
     flashvars.gpx = '<%= h(params['gpx']) %>';
     <% end %>
@@ -56,7 +59,7 @@
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 
-    swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
+    swfobject.embedSWF("<%= asset_path("potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
diff --git a/public/potlatch2/bing_maps.png b/public/potlatch2/bing_maps.png
deleted file mode 100644
index bbc4b1dfa..000000000
Binary files a/public/potlatch2/bing_maps.png and /dev/null differ
diff --git a/public/potlatch2/features/aeroway__aerodrome.png b/public/potlatch2/features/aeroway__aerodrome.png
deleted file mode 100644
index 1f3e08852..000000000
Binary files a/public/potlatch2/features/aeroway__aerodrome.png and /dev/null differ
diff --git a/public/potlatch2/features/aeroway__apron.png b/public/potlatch2/features/aeroway__apron.png
deleted file mode 100644
index 57bca99a2..000000000
Binary files a/public/potlatch2/features/aeroway__apron.png and /dev/null differ
diff --git a/public/potlatch2/features/aeroway__helipad.png b/public/potlatch2/features/aeroway__helipad.png
deleted file mode 100644
index 2e575dbbc..000000000
Binary files a/public/potlatch2/features/aeroway__helipad.png and /dev/null differ
diff --git a/public/potlatch2/features/aeroway__runway.png b/public/potlatch2/features/aeroway__runway.png
deleted file mode 100644
index bbac49e8e..000000000
Binary files a/public/potlatch2/features/aeroway__runway.png and /dev/null differ
diff --git a/public/potlatch2/features/aeroway__taxiway.png b/public/potlatch2/features/aeroway__taxiway.png
deleted file mode 100644
index a5eda4d6a..000000000
Binary files a/public/potlatch2/features/aeroway__taxiway.png and /dev/null differ
diff --git a/public/potlatch2/features/aeroway__terminal.png b/public/potlatch2/features/aeroway__terminal.png
deleted file mode 100644
index 1f5857534..000000000
Binary files a/public/potlatch2/features/aeroway__terminal.png and /dev/null differ
diff --git a/public/potlatch2/features/amenity__bus_station.png b/public/potlatch2/features/amenity__bus_station.png
deleted file mode 100644
index b39567edd..000000000
Binary files a/public/potlatch2/features/amenity__bus_station.png and /dev/null differ
diff --git a/public/potlatch2/features/amenity__parking.png b/public/potlatch2/features/amenity__parking.png
deleted file mode 100644
index 0ea905139..000000000
Binary files a/public/potlatch2/features/amenity__parking.png and /dev/null differ
diff --git a/public/potlatch2/features/barrier_generic.png b/public/potlatch2/features/barrier_generic.png
deleted file mode 100644
index fe72ab408..000000000
Binary files a/public/potlatch2/features/barrier_generic.png and /dev/null differ
diff --git a/public/potlatch2/features/bike-shop.png b/public/potlatch2/features/bike-shop.png
deleted file mode 100644
index b7a0c68ac..000000000
Binary files a/public/potlatch2/features/bike-shop.png and /dev/null differ
diff --git a/public/potlatch2/features/bugs/fixed.png b/public/potlatch2/features/bugs/fixed.png
deleted file mode 100644
index 99c265bf4..000000000
Binary files a/public/potlatch2/features/bugs/fixed.png and /dev/null differ
diff --git a/public/potlatch2/features/bugs/invalid.png b/public/potlatch2/features/bugs/invalid.png
deleted file mode 100644
index 35bddf13f..000000000
Binary files a/public/potlatch2/features/bugs/invalid.png and /dev/null differ
diff --git a/public/potlatch2/features/bugs/open.png b/public/potlatch2/features/bugs/open.png
deleted file mode 100644
index 4432db938..000000000
Binary files a/public/potlatch2/features/bugs/open.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__living_street.png b/public/potlatch2/features/highway__living_street.png
deleted file mode 100644
index 1143ec613..000000000
Binary files a/public/potlatch2/features/highway__living_street.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__motorway.png b/public/potlatch2/features/highway__motorway.png
deleted file mode 100644
index d57e808b8..000000000
Binary files a/public/potlatch2/features/highway__motorway.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__motorway_link.png b/public/potlatch2/features/highway__motorway_link.png
deleted file mode 100644
index db29b4ba5..000000000
Binary files a/public/potlatch2/features/highway__motorway_link.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__primary.png b/public/potlatch2/features/highway__primary.png
deleted file mode 100644
index 096e69579..000000000
Binary files a/public/potlatch2/features/highway__primary.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__primary_link.png b/public/potlatch2/features/highway__primary_link.png
deleted file mode 100644
index cf5528a13..000000000
Binary files a/public/potlatch2/features/highway__primary_link.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__residential.png b/public/potlatch2/features/highway__residential.png
deleted file mode 100644
index 5632f52d3..000000000
Binary files a/public/potlatch2/features/highway__residential.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__secondary.png b/public/potlatch2/features/highway__secondary.png
deleted file mode 100644
index 6d826c4d7..000000000
Binary files a/public/potlatch2/features/highway__secondary.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__secondary_link.png b/public/potlatch2/features/highway__secondary_link.png
deleted file mode 100644
index fd348a8d0..000000000
Binary files a/public/potlatch2/features/highway__secondary_link.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__service.png b/public/potlatch2/features/highway__service.png
deleted file mode 100644
index 4c356394f..000000000
Binary files a/public/potlatch2/features/highway__service.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__tertiary.png b/public/potlatch2/features/highway__tertiary.png
deleted file mode 100644
index 16daae046..000000000
Binary files a/public/potlatch2/features/highway__tertiary.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__tertiary_link.png b/public/potlatch2/features/highway__tertiary_link.png
deleted file mode 100644
index bc1010208..000000000
Binary files a/public/potlatch2/features/highway__tertiary_link.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__track.png b/public/potlatch2/features/highway__track.png
deleted file mode 100644
index ce5855ed2..000000000
Binary files a/public/potlatch2/features/highway__track.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__trunk.png b/public/potlatch2/features/highway__trunk.png
deleted file mode 100644
index 5018b4712..000000000
Binary files a/public/potlatch2/features/highway__trunk.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__trunk_link.png b/public/potlatch2/features/highway__trunk_link.png
deleted file mode 100644
index 32a489621..000000000
Binary files a/public/potlatch2/features/highway__trunk_link.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__unclassified.png b/public/potlatch2/features/highway__unclassified.png
deleted file mode 100644
index ae6ea7ba3..000000000
Binary files a/public/potlatch2/features/highway__unclassified.png and /dev/null differ
diff --git a/public/potlatch2/features/highway__unknown.png b/public/potlatch2/features/highway__unknown.png
deleted file mode 100644
index d61d54a91..000000000
Binary files a/public/potlatch2/features/highway__unknown.png and /dev/null differ
diff --git a/public/potlatch2/features/manmade_lighthouse.png b/public/potlatch2/features/manmade_lighthouse.png
deleted file mode 100644
index 6aaf5f9ff..000000000
Binary files a/public/potlatch2/features/manmade_lighthouse.png and /dev/null differ
diff --git a/public/potlatch2/features/manmade_silo.png b/public/potlatch2/features/manmade_silo.png
deleted file mode 100644
index be207ce02..000000000
Binary files a/public/potlatch2/features/manmade_silo.png and /dev/null differ
diff --git a/public/potlatch2/features/manmade_tower.png b/public/potlatch2/features/manmade_tower.png
deleted file mode 100644
index bcb4e3f40..000000000
Binary files a/public/potlatch2/features/manmade_tower.png and /dev/null differ
diff --git a/public/potlatch2/features/natural__beach.png b/public/potlatch2/features/natural__beach.png
deleted file mode 100644
index 5846d1999..000000000
Binary files a/public/potlatch2/features/natural__beach.png and /dev/null differ
diff --git a/public/potlatch2/features/oneway__-1.png b/public/potlatch2/features/oneway__-1.png
deleted file mode 100644
index e8e680574..000000000
Binary files a/public/potlatch2/features/oneway__-1.png and /dev/null differ
diff --git a/public/potlatch2/features/oneway__no.png b/public/potlatch2/features/oneway__no.png
deleted file mode 100644
index a50e12ffa..000000000
Binary files a/public/potlatch2/features/oneway__no.png and /dev/null differ
diff --git a/public/potlatch2/features/oneway__yes.png b/public/potlatch2/features/oneway__yes.png
deleted file mode 100644
index 4236836ad..000000000
Binary files a/public/potlatch2/features/oneway__yes.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__bike.png b/public/potlatch2/features/paths__bike.png
deleted file mode 100644
index 0d9c01285..000000000
Binary files a/public/potlatch2/features/paths__bike.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__bridleway.png b/public/potlatch2/features/paths__bridleway.png
deleted file mode 100644
index 94772d018..000000000
Binary files a/public/potlatch2/features/paths__bridleway.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__footway.png b/public/potlatch2/features/paths__footway.png
deleted file mode 100644
index c7c476e63..000000000
Binary files a/public/potlatch2/features/paths__footway.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__pedestrian.png b/public/potlatch2/features/paths__pedestrian.png
deleted file mode 100644
index 3ad754937..000000000
Binary files a/public/potlatch2/features/paths__pedestrian.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__steps.png b/public/potlatch2/features/paths__steps.png
deleted file mode 100644
index e32cfd8c7..000000000
Binary files a/public/potlatch2/features/paths__steps.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__unofficial.png b/public/potlatch2/features/paths__unofficial.png
deleted file mode 100644
index fa428df53..000000000
Binary files a/public/potlatch2/features/paths__unofficial.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png b/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png
deleted file mode 100644
index 2a6ec573a..000000000
Binary files a/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png b/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png
deleted file mode 100644
index e40e3d80e..000000000
Binary files a/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_camping.n.24.png b/public/potlatch2/features/pois/accommodation_camping.n.24.png
deleted file mode 100644
index 926bd4a40..000000000
Binary files a/public/potlatch2/features/pois/accommodation_camping.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png b/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png
deleted file mode 100644
index 6a0c952d2..000000000
Binary files a/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_chalet.n.24.png b/public/potlatch2/features/pois/accommodation_chalet.n.24.png
deleted file mode 100644
index 57d531ed4..000000000
Binary files a/public/potlatch2/features/pois/accommodation_chalet.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_hotel.n.24.png b/public/potlatch2/features/pois/accommodation_hotel.n.24.png
deleted file mode 100644
index 129a44c6d..000000000
Binary files a/public/potlatch2/features/pois/accommodation_hotel.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_motel.n.24.png b/public/potlatch2/features/pois/accommodation_motel.n.24.png
deleted file mode 100644
index d7a85b777..000000000
Binary files a/public/potlatch2/features/pois/accommodation_motel.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png
deleted file mode 100644
index 68b8b04ef..000000000
Binary files a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png b/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png
deleted file mode 100644
index 13f18df6d..000000000
Binary files a/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_bench.n.24.png b/public/potlatch2/features/pois/amenity_bench.n.24.png
deleted file mode 100644
index 08c66b07a..000000000
Binary files a/public/potlatch2/features/pois/amenity_bench.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_firestation2.n.24.png b/public/potlatch2/features/pois/amenity_firestation2.n.24.png
deleted file mode 100644
index 443189fba..000000000
Binary files a/public/potlatch2/features/pois/amenity_firestation2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_fountain2.n.24.png b/public/potlatch2/features/pois/amenity_fountain2.n.24.png
deleted file mode 100644
index f8c5e3755..000000000
Binary files a/public/potlatch2/features/pois/amenity_fountain2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_information.n.24.png b/public/potlatch2/features/pois/amenity_information.n.24.png
deleted file mode 100644
index c7fddf7bc..000000000
Binary files a/public/potlatch2/features/pois/amenity_information.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_library.n.24.png b/public/potlatch2/features/pois/amenity_library.n.24.png
deleted file mode 100644
index 658e1f1ba..000000000
Binary files a/public/potlatch2/features/pois/amenity_library.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_playground.n.24.png b/public/potlatch2/features/pois/amenity_playground.n.24.png
deleted file mode 100644
index 1e8494739..000000000
Binary files a/public/potlatch2/features/pois/amenity_playground.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_police2.n.24.png b/public/potlatch2/features/pois/amenity_police2.n.24.png
deleted file mode 100644
index a9d6566f8..000000000
Binary files a/public/potlatch2/features/pois/amenity_police2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_post_box.n.24.png b/public/potlatch2/features/pois/amenity_post_box.n.24.png
deleted file mode 100644
index 4b5eb86af..000000000
Binary files a/public/potlatch2/features/pois/amenity_post_box.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_post_office.n.24.png b/public/potlatch2/features/pois/amenity_post_office.n.24.png
deleted file mode 100644
index 803665d05..000000000
Binary files a/public/potlatch2/features/pois/amenity_post_office.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_recycling.n.24.png b/public/potlatch2/features/pois/amenity_recycling.n.24.png
deleted file mode 100644
index d608f7d7f..000000000
Binary files a/public/potlatch2/features/pois/amenity_recycling.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_telephone.n.24.png b/public/potlatch2/features/pois/amenity_telephone.n.24.png
deleted file mode 100644
index 0fc460d20..000000000
Binary files a/public/potlatch2/features/pois/amenity_telephone.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_toilets.n.24.png b/public/potlatch2/features/pois/amenity_toilets.n.24.png
deleted file mode 100644
index f8475f06f..000000000
Binary files a/public/potlatch2/features/pois/amenity_toilets.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_town_hall.n.24.png b/public/potlatch2/features/pois/amenity_town_hall.n.24.png
deleted file mode 100644
index 390289c4d..000000000
Binary files a/public/potlatch2/features/pois/amenity_town_hall.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/amenity_waste_bin.n.24.png b/public/potlatch2/features/pois/amenity_waste_bin.n.24.png
deleted file mode 100644
index fb06a04b7..000000000
Binary files a/public/potlatch2/features/pois/amenity_waste_bin.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_blocks.24.png b/public/potlatch2/features/pois/barrier_blocks.24.png
deleted file mode 100644
index b6671478b..000000000
Binary files a/public/potlatch2/features/pois/barrier_blocks.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_bollard.n.24.png b/public/potlatch2/features/pois/barrier_bollard.n.24.png
deleted file mode 100644
index 3000661f9..000000000
Binary files a/public/potlatch2/features/pois/barrier_bollard.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_cattle_grid.24.png b/public/potlatch2/features/pois/barrier_cattle_grid.24.png
deleted file mode 100644
index 102da8984..000000000
Binary files a/public/potlatch2/features/pois/barrier_cattle_grid.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_cycle_barrier.24.png b/public/potlatch2/features/pois/barrier_cycle_barrier.24.png
deleted file mode 100644
index 474efd6ba..000000000
Binary files a/public/potlatch2/features/pois/barrier_cycle_barrier.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_gate.n.24.png b/public/potlatch2/features/pois/barrier_gate.n.24.png
deleted file mode 100644
index 0c18c5edd..000000000
Binary files a/public/potlatch2/features/pois/barrier_gate.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_kissing_gate.24.png b/public/potlatch2/features/pois/barrier_kissing_gate.24.png
deleted file mode 100644
index a2c3e55b8..000000000
Binary files a/public/potlatch2/features/pois/barrier_kissing_gate.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_lift_gate.n.24.png b/public/potlatch2/features/pois/barrier_lift_gate.n.24.png
deleted file mode 100644
index a41a3679e..000000000
Binary files a/public/potlatch2/features/pois/barrier_lift_gate.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_stile.n.24.png b/public/potlatch2/features/pois/barrier_stile.n.24.png
deleted file mode 100644
index 9e04ae23d..000000000
Binary files a/public/potlatch2/features/pois/barrier_stile.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_toll_booth.n.24.png b/public/potlatch2/features/pois/barrier_toll_booth.n.24.png
deleted file mode 100644
index 302492ada..000000000
Binary files a/public/potlatch2/features/pois/barrier_toll_booth.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/building_generic.png b/public/potlatch2/features/pois/building_generic.png
deleted file mode 100644
index 669fb027f..000000000
Binary files a/public/potlatch2/features/pois/building_generic.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/education_nursery3.n.24.png b/public/potlatch2/features/pois/education_nursery3.n.24.png
deleted file mode 100644
index b0314ff3e..000000000
Binary files a/public/potlatch2/features/pois/education_nursery3.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/education_school.n.24.png b/public/potlatch2/features/pois/education_school.n.24.png
deleted file mode 100644
index 40abf2b68..000000000
Binary files a/public/potlatch2/features/pois/education_school.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/education_university.n.24.png b/public/potlatch2/features/pois/education_university.n.24.png
deleted file mode 100644
index 62936341d..000000000
Binary files a/public/potlatch2/features/pois/education_university.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/emergency-telephone-24.png b/public/potlatch2/features/pois/emergency-telephone-24.png
deleted file mode 100644
index 466ef96b7..000000000
Binary files a/public/potlatch2/features/pois/emergency-telephone-24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/food_bar.n.24.png b/public/potlatch2/features/pois/food_bar.n.24.png
deleted file mode 100644
index a63a09d4d..000000000
Binary files a/public/potlatch2/features/pois/food_bar.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/food_cafe.n.24.png b/public/potlatch2/features/pois/food_cafe.n.24.png
deleted file mode 100644
index 9e9b3173e..000000000
Binary files a/public/potlatch2/features/pois/food_cafe.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/food_drinkingtap.n.24.png b/public/potlatch2/features/pois/food_drinkingtap.n.24.png
deleted file mode 100644
index 313572e50..000000000
Binary files a/public/potlatch2/features/pois/food_drinkingtap.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/food_fastfood.n.24.png b/public/potlatch2/features/pois/food_fastfood.n.24.png
deleted file mode 100644
index 96f5e7706..000000000
Binary files a/public/potlatch2/features/pois/food_fastfood.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/food_pub.n.24.png b/public/potlatch2/features/pois/food_pub.n.24.png
deleted file mode 100644
index 714914f7a..000000000
Binary files a/public/potlatch2/features/pois/food_pub.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/food_restaurant.n.24.png b/public/potlatch2/features/pois/food_restaurant.n.24.png
deleted file mode 100644
index e7813ea2a..000000000
Binary files a/public/potlatch2/features/pois/food_restaurant.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/health_hospital.n.24.png b/public/potlatch2/features/pois/health_hospital.n.24.png
deleted file mode 100644
index 62e68fb87..000000000
Binary files a/public/potlatch2/features/pois/health_hospital.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/health_pharmacy.n.24.png b/public/potlatch2/features/pois/health_pharmacy.n.24.png
deleted file mode 100644
index d2aa8c2ec..000000000
Binary files a/public/potlatch2/features/pois/health_pharmacy.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png b/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png
deleted file mode 100644
index 243d6e618..000000000
Binary files a/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/landuse_coniferous.n.24.png b/public/potlatch2/features/pois/landuse_coniferous.n.24.png
deleted file mode 100644
index 93f6c0df2..000000000
Binary files a/public/potlatch2/features/pois/landuse_coniferous.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/landuse_grass.n.24.png b/public/potlatch2/features/pois/landuse_grass.n.24.png
deleted file mode 100644
index f65bde37e..000000000
Binary files a/public/potlatch2/features/pois/landuse_grass.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/money_atm.n.24.png b/public/potlatch2/features/pois/money_atm.n.24.png
deleted file mode 100644
index f1e55e803..000000000
Binary files a/public/potlatch2/features/pois/money_atm.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/money_bank2.n.24.png b/public/potlatch2/features/pois/money_bank2.n.24.png
deleted file mode 100644
index 74c511472..000000000
Binary files a/public/potlatch2/features/pois/money_bank2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png
deleted file mode 100644
index 103a21b2a..000000000
Binary files a/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png
deleted file mode 100644
index 2f9169166..000000000
Binary files a/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png b/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png
deleted file mode 100644
index 7e2bd19af..000000000
Binary files a/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_military_bunker.n.24.png b/public/potlatch2/features/pois/poi_military_bunker.n.24.png
deleted file mode 100644
index 3bcc77a00..000000000
Binary files a/public/potlatch2/features/pois/poi_military_bunker.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_mine.n.24.png b/public/potlatch2/features/pois/poi_mine.n.24.png
deleted file mode 100644
index 57c6d9435..000000000
Binary files a/public/potlatch2/features/pois/poi_mine.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_place_city.p.24.png b/public/potlatch2/features/pois/poi_place_city.p.24.png
deleted file mode 100644
index d2f629cf9..000000000
Binary files a/public/potlatch2/features/pois/poi_place_city.p.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_place_hamlet.p.24.png b/public/potlatch2/features/pois/poi_place_hamlet.p.24.png
deleted file mode 100644
index 1a938cef9..000000000
Binary files a/public/potlatch2/features/pois/poi_place_hamlet.p.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_place_suburb.p.24.png b/public/potlatch2/features/pois/poi_place_suburb.p.24.png
deleted file mode 100644
index 633e1804c..000000000
Binary files a/public/potlatch2/features/pois/poi_place_suburb.p.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_place_town.p.24.png b/public/potlatch2/features/pois/poi_place_town.p.24.png
deleted file mode 100644
index b456dc22b..000000000
Binary files a/public/potlatch2/features/pois/poi_place_town.p.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/poi_place_village.p.24.png b/public/potlatch2/features/pois/poi_place_village.p.24.png
deleted file mode 100644
index ee050b4e6..000000000
Binary files a/public/potlatch2/features/pois/poi_place_village.p.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/power_station.png b/public/potlatch2/features/pois/power_station.png
deleted file mode 100644
index 3417b4d3c..000000000
Binary files a/public/potlatch2/features/pois/power_station.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/power_substation.n.24.png b/public/potlatch2/features/pois/power_substation.n.24.png
deleted file mode 100644
index 3cf3bff40..000000000
Binary files a/public/potlatch2/features/pois/power_substation.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/power_tower_high2.n.24.png b/public/potlatch2/features/pois/power_tower_high2.n.24.png
deleted file mode 100644
index 98822fa7e..000000000
Binary files a/public/potlatch2/features/pois/power_tower_high2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/power_tower_low.n.24.png b/public/potlatch2/features/pois/power_tower_low.n.24.png
deleted file mode 100644
index de3d6dbbd..000000000
Binary files a/public/potlatch2/features/pois/power_tower_low.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/power_transformer.n.24.png b/public/potlatch2/features/pois/power_transformer.n.24.png
deleted file mode 100644
index 87a43eb64..000000000
Binary files a/public/potlatch2/features/pois/power_transformer.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_alcohol.n.24.png b/public/potlatch2/features/pois/shopping_alcohol.n.24.png
deleted file mode 100644
index c22cc3b67..000000000
Binary files a/public/potlatch2/features/pois/shopping_alcohol.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_bakery.n.24.png b/public/potlatch2/features/pois/shopping_bakery.n.24.png
deleted file mode 100644
index f588a198a..000000000
Binary files a/public/potlatch2/features/pois/shopping_bakery.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_bicycle.n.24.png b/public/potlatch2/features/pois/shopping_bicycle.n.24.png
deleted file mode 100644
index dce1d15d4..000000000
Binary files a/public/potlatch2/features/pois/shopping_bicycle.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_book.n.24.png b/public/potlatch2/features/pois/shopping_book.n.24.png
deleted file mode 100644
index 51441eaeb..000000000
Binary files a/public/potlatch2/features/pois/shopping_book.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_butcher.n.24.png b/public/potlatch2/features/pois/shopping_butcher.n.24.png
deleted file mode 100644
index 8efbb3f0f..000000000
Binary files a/public/potlatch2/features/pois/shopping_butcher.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_car.n.24.png b/public/potlatch2/features/pois/shopping_car.n.24.png
deleted file mode 100644
index cefb9124a..000000000
Binary files a/public/potlatch2/features/pois/shopping_car.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_car_repair.n.24.png b/public/potlatch2/features/pois/shopping_car_repair.n.24.png
deleted file mode 100644
index 6abdcb7f0..000000000
Binary files a/public/potlatch2/features/pois/shopping_car_repair.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_clothes.n.24.png b/public/potlatch2/features/pois/shopping_clothes.n.24.png
deleted file mode 100644
index e5c7089d1..000000000
Binary files a/public/potlatch2/features/pois/shopping_clothes.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_confectionery.n.24.png b/public/potlatch2/features/pois/shopping_confectionery.n.24.png
deleted file mode 100644
index 2e1dbaef7..000000000
Binary files a/public/potlatch2/features/pois/shopping_confectionery.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_convenience.n.24.png b/public/potlatch2/features/pois/shopping_convenience.n.24.png
deleted file mode 100644
index 7a3563391..000000000
Binary files a/public/potlatch2/features/pois/shopping_convenience.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_diy.n.24.png b/public/potlatch2/features/pois/shopping_diy.n.24.png
deleted file mode 100644
index c8236cba9..000000000
Binary files a/public/potlatch2/features/pois/shopping_diy.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_fish.n.24.png b/public/potlatch2/features/pois/shopping_fish.n.24.png
deleted file mode 100644
index fe5eccee6..000000000
Binary files a/public/potlatch2/features/pois/shopping_fish.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_florist.n.24.png b/public/potlatch2/features/pois/shopping_florist.n.24.png
deleted file mode 100644
index 6dd9376b3..000000000
Binary files a/public/potlatch2/features/pois/shopping_florist.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png b/public/potlatch2/features/pois/shopping_garden_centre.n.24.png
deleted file mode 100644
index a4f9b3260..000000000
Binary files a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_gift.n.24.png b/public/potlatch2/features/pois/shopping_gift.n.24.png
deleted file mode 100644
index a81617805..000000000
Binary files a/public/potlatch2/features/pois/shopping_gift.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_greengrocer.n.24.png b/public/potlatch2/features/pois/shopping_greengrocer.n.24.png
deleted file mode 100644
index ad402d550..000000000
Binary files a/public/potlatch2/features/pois/shopping_greengrocer.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_hairdresser.n.24.png b/public/potlatch2/features/pois/shopping_hairdresser.n.24.png
deleted file mode 100644
index e844989fd..000000000
Binary files a/public/potlatch2/features/pois/shopping_hairdresser.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_hifi.n.24.png b/public/potlatch2/features/pois/shopping_hifi.n.24.png
deleted file mode 100644
index 66ec0b950..000000000
Binary files a/public/potlatch2/features/pois/shopping_hifi.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_jewelry.n.24.png b/public/potlatch2/features/pois/shopping_jewelry.n.24.png
deleted file mode 100644
index c3e8a519f..000000000
Binary files a/public/potlatch2/features/pois/shopping_jewelry.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_kiosk.n.24.png b/public/potlatch2/features/pois/shopping_kiosk.n.24.png
deleted file mode 100644
index de4ab5a60..000000000
Binary files a/public/potlatch2/features/pois/shopping_kiosk.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_laundrette.n.24.png b/public/potlatch2/features/pois/shopping_laundrette.n.24.png
deleted file mode 100644
index 55a0ca2e1..000000000
Binary files a/public/potlatch2/features/pois/shopping_laundrette.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_marketplace.n.24.png b/public/potlatch2/features/pois/shopping_marketplace.n.24.png
deleted file mode 100644
index 4fba55a7f..000000000
Binary files a/public/potlatch2/features/pois/shopping_marketplace.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_motorcycle.n.24.png b/public/potlatch2/features/pois/shopping_motorcycle.n.24.png
deleted file mode 100644
index cf4248f33..000000000
Binary files a/public/potlatch2/features/pois/shopping_motorcycle.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_music.n.24.png b/public/potlatch2/features/pois/shopping_music.n.24.png
deleted file mode 100644
index 17df5c563..000000000
Binary files a/public/potlatch2/features/pois/shopping_music.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_supermarket.n.24.png b/public/potlatch2/features/pois/shopping_supermarket.n.24.png
deleted file mode 100644
index fd2584686..000000000
Binary files a/public/potlatch2/features/pois/shopping_supermarket.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_toys.n.24.png b/public/potlatch2/features/pois/shopping_toys.n.24.png
deleted file mode 100644
index 63500028d..000000000
Binary files a/public/potlatch2/features/pois/shopping_toys.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_vending_machine.n.24.png b/public/potlatch2/features/pois/shopping_vending_machine.n.24.png
deleted file mode 100644
index 1a18e63af..000000000
Binary files a/public/potlatch2/features/pois/shopping_vending_machine.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/sport_golf.n.24.png b/public/potlatch2/features/pois/sport_golf.n.24.png
deleted file mode 100644
index ad42a4e51..000000000
Binary files a/public/potlatch2/features/pois/sport_golf.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/sport_leisure_centre.n.24.png b/public/potlatch2/features/pois/sport_leisure_centre.n.24.png
deleted file mode 100644
index dd6d636c8..000000000
Binary files a/public/potlatch2/features/pois/sport_leisure_centre.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/sport_shooting.n.24.png b/public/potlatch2/features/pois/sport_shooting.n.24.png
deleted file mode 100644
index f26d78de4..000000000
Binary files a/public/potlatch2/features/pois/sport_shooting.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/sport_stadium.n.24.png b/public/potlatch2/features/pois/sport_stadium.n.24.png
deleted file mode 100644
index f1349e437..000000000
Binary files a/public/potlatch2/features/pois/sport_stadium.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png b/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png
deleted file mode 100644
index a0e0c61a7..000000000
Binary files a/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_archaeological.n.24.png b/public/potlatch2/features/pois/tourist_archaeological.n.24.png
deleted file mode 100644
index a75a358bd..000000000
Binary files a/public/potlatch2/features/pois/tourist_archaeological.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png b/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png
deleted file mode 100644
index 5cd89b60b..000000000
Binary files a/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_attraction.n.24.png b/public/potlatch2/features/pois/tourist_attraction.n.24.png
deleted file mode 100644
index 2f849d85f..000000000
Binary files a/public/potlatch2/features/pois/tourist_attraction.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_battlefield.n.24.png b/public/potlatch2/features/pois/tourist_battlefield.n.24.png
deleted file mode 100644
index b502bfc7b..000000000
Binary files a/public/potlatch2/features/pois/tourist_battlefield.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_castle.n.24.png b/public/potlatch2/features/pois/tourist_castle.n.24.png
deleted file mode 100644
index 75734d678..000000000
Binary files a/public/potlatch2/features/pois/tourist_castle.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_cinema.n.24.png b/public/potlatch2/features/pois/tourist_cinema.n.24.png
deleted file mode 100644
index 4207e8427..000000000
Binary files a/public/potlatch2/features/pois/tourist_cinema.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_memorial.n.24.png b/public/potlatch2/features/pois/tourist_memorial.n.24.png
deleted file mode 100644
index 2729e68de..000000000
Binary files a/public/potlatch2/features/pois/tourist_memorial.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_monument.n.24.png b/public/potlatch2/features/pois/tourist_monument.n.24.png
deleted file mode 100644
index 853632b0b..000000000
Binary files a/public/potlatch2/features/pois/tourist_monument.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_museum.n.24.png b/public/potlatch2/features/pois/tourist_museum.n.24.png
deleted file mode 100644
index 3cdea51d5..000000000
Binary files a/public/potlatch2/features/pois/tourist_museum.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_picnic.n.24.png b/public/potlatch2/features/pois/tourist_picnic.n.24.png
deleted file mode 100644
index 6943ab48e..000000000
Binary files a/public/potlatch2/features/pois/tourist_picnic.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_ruin.n.24.png b/public/potlatch2/features/pois/tourist_ruin.n.24.png
deleted file mode 100644
index d8650c1fc..000000000
Binary files a/public/potlatch2/features/pois/tourist_ruin.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_theatre.n.24.png b/public/potlatch2/features/pois/tourist_theatre.n.24.png
deleted file mode 100644
index a5db00bd6..000000000
Binary files a/public/potlatch2/features/pois/tourist_theatre.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_theme_park.n.24.png b/public/potlatch2/features/pois/tourist_theme_park.n.24.png
deleted file mode 100644
index 733f03f4d..000000000
Binary files a/public/potlatch2/features/pois/tourist_theme_park.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_view_point.n.24.png b/public/potlatch2/features/pois/tourist_view_point.n.24.png
deleted file mode 100644
index a2dde9ebb..000000000
Binary files a/public/potlatch2/features/pois/tourist_view_point.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/tourist_zoo.n.24.png b/public/potlatch2/features/pois/tourist_zoo.n.24.png
deleted file mode 100644
index f33b9d861..000000000
Binary files a/public/potlatch2/features/pois/tourist_zoo.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_aerodrome.n.24.png b/public/potlatch2/features/pois/transport_aerodrome.n.24.png
deleted file mode 100644
index 83b7eccf1..000000000
Binary files a/public/potlatch2/features/pois/transport_aerodrome.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_airport.n.24.png b/public/potlatch2/features/pois/transport_airport.n.24.png
deleted file mode 100644
index 4e6bddb53..000000000
Binary files a/public/potlatch2/features/pois/transport_airport.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_airport_gate.n.24.png b/public/potlatch2/features/pois/transport_airport_gate.n.24.png
deleted file mode 100644
index 455a311df..000000000
Binary files a/public/potlatch2/features/pois/transport_airport_gate.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_airport_terminal.n.24.png b/public/potlatch2/features/pois/transport_airport_terminal.n.24.png
deleted file mode 100644
index 33bbd5450..000000000
Binary files a/public/potlatch2/features/pois/transport_airport_terminal.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_bus_station.n.24.png b/public/potlatch2/features/pois/transport_bus_station.n.24.png
deleted file mode 100644
index e9cdc7e13..000000000
Binary files a/public/potlatch2/features/pois/transport_bus_station.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_bus_stop2.n.24.png b/public/potlatch2/features/pois/transport_bus_stop2.n.24.png
deleted file mode 100644
index d81484abd..000000000
Binary files a/public/potlatch2/features/pois/transport_bus_stop2.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_car_wash.n.24.png b/public/potlatch2/features/pois/transport_car_wash.n.24.png
deleted file mode 100644
index 1c173e21a..000000000
Binary files a/public/potlatch2/features/pois/transport_car_wash.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_fuel.n.24.png b/public/potlatch2/features/pois/transport_fuel.n.24.png
deleted file mode 100644
index 736e943b7..000000000
Binary files a/public/potlatch2/features/pois/transport_fuel.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png b/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png
deleted file mode 100644
index e5e4e2fe7..000000000
Binary files a/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_marina.n.24.png b/public/potlatch2/features/pois/transport_marina.n.24.png
deleted file mode 100644
index 5024e3e82..000000000
Binary files a/public/potlatch2/features/pois/transport_marina.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png b/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png
deleted file mode 100644
index 41b1de3dc..000000000
Binary files a/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png b/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png
deleted file mode 100644
index 42f2e54c1..000000000
Binary files a/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_parking_car.n.24.png b/public/potlatch2/features/pois/transport_parking_car.n.24.png
deleted file mode 100644
index 6aa900cb9..000000000
Binary files a/public/potlatch2/features/pois/transport_parking_car.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_port.n.24.png b/public/potlatch2/features/pois/transport_port.n.24.png
deleted file mode 100644
index 6e5f6e19d..000000000
Binary files a/public/potlatch2/features/pois/transport_port.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png b/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png
deleted file mode 100644
index 773ac431a..000000000
Binary files a/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_rental_car.n.24.png b/public/potlatch2/features/pois/transport_rental_car.n.24.png
deleted file mode 100644
index 5570e708c..000000000
Binary files a/public/potlatch2/features/pois/transport_rental_car.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_slipway.n.24.png b/public/potlatch2/features/pois/transport_slipway.n.24.png
deleted file mode 100644
index 5a34dcbc7..000000000
Binary files a/public/potlatch2/features/pois/transport_slipway.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_speedbump.n.24.png b/public/potlatch2/features/pois/transport_speedbump.n.24.png
deleted file mode 100644
index a4f5efd6c..000000000
Binary files a/public/potlatch2/features/pois/transport_speedbump.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_taxi_rank.n.24.png b/public/potlatch2/features/pois/transport_taxi_rank.n.24.png
deleted file mode 100644
index 8fd307345..000000000
Binary files a/public/potlatch2/features/pois/transport_taxi_rank.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_traffic_calming.n.24.png b/public/potlatch2/features/pois/transport_traffic_calming.n.24.png
deleted file mode 100644
index 5c50233cd..000000000
Binary files a/public/potlatch2/features/pois/transport_traffic_calming.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_train_station.n.24.png b/public/potlatch2/features/pois/transport_train_station.n.24.png
deleted file mode 100644
index 6e1cb10a9..000000000
Binary files a/public/potlatch2/features/pois/transport_train_station.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_tram_stop.n.24.png b/public/potlatch2/features/pois/transport_tram_stop.n.24.png
deleted file mode 100644
index edf534845..000000000
Binary files a/public/potlatch2/features/pois/transport_tram_stop.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_turning_circle.n.24.png b/public/potlatch2/features/pois/transport_turning_circle.n.24.png
deleted file mode 100644
index 47736bc34..000000000
Binary files a/public/potlatch2/features/pois/transport_turning_circle.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_weir.n.24.png b/public/potlatch2/features/pois/transport_weir.n.24.png
deleted file mode 100644
index e699d3b05..000000000
Binary files a/public/potlatch2/features/pois/transport_weir.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_zebracrossing.n.24.png b/public/potlatch2/features/pois/transport_zebracrossing.n.24.png
deleted file mode 100644
index 21e0c77d3..000000000
Binary files a/public/potlatch2/features/pois/transport_zebracrossing.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/power_high.png b/public/potlatch2/features/power_high.png
deleted file mode 100644
index c8b102d49..000000000
Binary files a/public/potlatch2/features/power_high.png and /dev/null differ
diff --git a/public/potlatch2/features/power_low.png b/public/potlatch2/features/power_low.png
deleted file mode 100644
index e45f405c1..000000000
Binary files a/public/potlatch2/features/power_low.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__abandoned.png b/public/potlatch2/features/railway__abandoned.png
deleted file mode 100644
index 3b7a02ed5..000000000
Binary files a/public/potlatch2/features/railway__abandoned.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__disused.png b/public/potlatch2/features/railway__disused.png
deleted file mode 100644
index 2b24f69a8..000000000
Binary files a/public/potlatch2/features/railway__disused.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__light.png b/public/potlatch2/features/railway__light.png
deleted file mode 100644
index 0e2eca7c2..000000000
Binary files a/public/potlatch2/features/railway__light.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__platform.png b/public/potlatch2/features/railway__platform.png
deleted file mode 100644
index e6d591979..000000000
Binary files a/public/potlatch2/features/railway__platform.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__preserved.png b/public/potlatch2/features/railway__preserved.png
deleted file mode 100644
index 28d4f5ccd..000000000
Binary files a/public/potlatch2/features/railway__preserved.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__rail.png b/public/potlatch2/features/railway__rail.png
deleted file mode 100644
index 0aa4e66d6..000000000
Binary files a/public/potlatch2/features/railway__rail.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__siding.png b/public/potlatch2/features/railway__siding.png
deleted file mode 100644
index 9519ee0a1..000000000
Binary files a/public/potlatch2/features/railway__siding.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__spur.png b/public/potlatch2/features/railway__spur.png
deleted file mode 100644
index 4cde3d8e7..000000000
Binary files a/public/potlatch2/features/railway__spur.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__subway.png b/public/potlatch2/features/railway__subway.png
deleted file mode 100644
index 7e13bd022..000000000
Binary files a/public/potlatch2/features/railway__subway.png and /dev/null differ
diff --git a/public/potlatch2/features/railway__tram.png b/public/potlatch2/features/railway__tram.png
deleted file mode 100644
index 2940c7a8f..000000000
Binary files a/public/potlatch2/features/railway__tram.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__no_left_turn.png b/public/potlatch2/features/restriction__no_left_turn.png
deleted file mode 100644
index 9d1695291..000000000
Binary files a/public/potlatch2/features/restriction__no_left_turn.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__no_right_turn.png b/public/potlatch2/features/restriction__no_right_turn.png
deleted file mode 100644
index 1cd51f03e..000000000
Binary files a/public/potlatch2/features/restriction__no_right_turn.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__no_straight_on.png b/public/potlatch2/features/restriction__no_straight_on.png
deleted file mode 100644
index 9cc66283a..000000000
Binary files a/public/potlatch2/features/restriction__no_straight_on.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__no_u_turn.png b/public/potlatch2/features/restriction__no_u_turn.png
deleted file mode 100644
index 2dba9bb0f..000000000
Binary files a/public/potlatch2/features/restriction__no_u_turn.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__only_left_turn.png b/public/potlatch2/features/restriction__only_left_turn.png
deleted file mode 100644
index 0c71faf5b..000000000
Binary files a/public/potlatch2/features/restriction__only_left_turn.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__only_right_turn.png b/public/potlatch2/features/restriction__only_right_turn.png
deleted file mode 100644
index d4ed16258..000000000
Binary files a/public/potlatch2/features/restriction__only_right_turn.png and /dev/null differ
diff --git a/public/potlatch2/features/restriction__only_straight_on.png b/public/potlatch2/features/restriction__only_straight_on.png
deleted file mode 100644
index d62b11193..000000000
Binary files a/public/potlatch2/features/restriction__only_straight_on.png and /dev/null differ
diff --git a/public/potlatch2/features/route__bus.png b/public/potlatch2/features/route__bus.png
deleted file mode 100644
index bb816ac83..000000000
Binary files a/public/potlatch2/features/route__bus.png and /dev/null differ
diff --git a/public/potlatch2/features/route__lcn.png b/public/potlatch2/features/route__lcn.png
deleted file mode 100644
index 21d59163e..000000000
Binary files a/public/potlatch2/features/route__lcn.png and /dev/null differ
diff --git a/public/potlatch2/features/route__lwn.png b/public/potlatch2/features/route__lwn.png
deleted file mode 100644
index 50ee446bd..000000000
Binary files a/public/potlatch2/features/route__lwn.png and /dev/null differ
diff --git a/public/potlatch2/features/route__mtb.png b/public/potlatch2/features/route__mtb.png
deleted file mode 100644
index 824360712..000000000
Binary files a/public/potlatch2/features/route__mtb.png and /dev/null differ
diff --git a/public/potlatch2/features/route__ncn.png b/public/potlatch2/features/route__ncn.png
deleted file mode 100644
index 7cc777919..000000000
Binary files a/public/potlatch2/features/route__ncn.png and /dev/null differ
diff --git a/public/potlatch2/features/route__nwn.png b/public/potlatch2/features/route__nwn.png
deleted file mode 100644
index 92ac04879..000000000
Binary files a/public/potlatch2/features/route__nwn.png and /dev/null differ
diff --git a/public/potlatch2/features/route__rcn.png b/public/potlatch2/features/route__rcn.png
deleted file mode 100644
index 614ac951f..000000000
Binary files a/public/potlatch2/features/route__rcn.png and /dev/null differ
diff --git a/public/potlatch2/features/route__rwn.png b/public/potlatch2/features/route__rwn.png
deleted file mode 100644
index fff9b233a..000000000
Binary files a/public/potlatch2/features/route__rwn.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__railway.png b/public/potlatch2/features/transport__railway.png
deleted file mode 100644
index e50b18693..000000000
Binary files a/public/potlatch2/features/transport__railway.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__railway_abandoned.png b/public/potlatch2/features/transport__railway_abandoned.png
deleted file mode 100644
index 81717b82d..000000000
Binary files a/public/potlatch2/features/transport__railway_abandoned.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__railway_disused.png b/public/potlatch2/features/transport__railway_disused.png
deleted file mode 100644
index 347b1c330..000000000
Binary files a/public/potlatch2/features/transport__railway_disused.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__railway_platform.png b/public/potlatch2/features/transport__railway_platform.png
deleted file mode 100644
index f1a5628ec..000000000
Binary files a/public/potlatch2/features/transport__railway_platform.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__subway.png b/public/potlatch2/features/transport__subway.png
deleted file mode 100644
index 2989d3e69..000000000
Binary files a/public/potlatch2/features/transport__subway.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__tram.png b/public/potlatch2/features/transport__tram.png
deleted file mode 100644
index e676eab84..000000000
Binary files a/public/potlatch2/features/transport__tram.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__basin.png b/public/potlatch2/features/waterway__basin.png
deleted file mode 100644
index 29798db20..000000000
Binary files a/public/potlatch2/features/waterway__basin.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__canal.png b/public/potlatch2/features/waterway__canal.png
deleted file mode 100644
index 8f04ccd3f..000000000
Binary files a/public/potlatch2/features/waterway__canal.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__coastline.png b/public/potlatch2/features/waterway__coastline.png
deleted file mode 100644
index 2239eb097..000000000
Binary files a/public/potlatch2/features/waterway__coastline.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__dam.png b/public/potlatch2/features/waterway__dam.png
deleted file mode 100644
index c5f720e89..000000000
Binary files a/public/potlatch2/features/waterway__dam.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__dock.png b/public/potlatch2/features/waterway__dock.png
deleted file mode 100644
index e6e40d1ff..000000000
Binary files a/public/potlatch2/features/waterway__dock.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__drain.png b/public/potlatch2/features/waterway__drain.png
deleted file mode 100644
index 6351862c8..000000000
Binary files a/public/potlatch2/features/waterway__drain.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__lake.png b/public/potlatch2/features/waterway__lake.png
deleted file mode 100644
index 275bb5722..000000000
Binary files a/public/potlatch2/features/waterway__lake.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__marina.png b/public/potlatch2/features/waterway__marina.png
deleted file mode 100644
index 3704b0011..000000000
Binary files a/public/potlatch2/features/waterway__marina.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__reservoir.png b/public/potlatch2/features/waterway__reservoir.png
deleted file mode 100644
index bd118e6db..000000000
Binary files a/public/potlatch2/features/waterway__reservoir.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__river.png b/public/potlatch2/features/waterway__river.png
deleted file mode 100644
index 79f7256ab..000000000
Binary files a/public/potlatch2/features/waterway__river.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__riverbank.png b/public/potlatch2/features/waterway__riverbank.png
deleted file mode 100644
index 7152808d5..000000000
Binary files a/public/potlatch2/features/waterway__riverbank.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__slipway.png b/public/potlatch2/features/waterway__slipway.png
deleted file mode 100644
index f50633b56..000000000
Binary files a/public/potlatch2/features/waterway__slipway.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__stream.png b/public/potlatch2/features/waterway__stream.png
deleted file mode 100644
index 888956e52..000000000
Binary files a/public/potlatch2/features/waterway__stream.png and /dev/null differ
diff --git a/public/potlatch2/features/waterway__weir.png b/public/potlatch2/features/waterway__weir.png
deleted file mode 100644
index 3b12080d2..000000000
Binary files a/public/potlatch2/features/waterway__weir.png and /dev/null differ
diff --git a/public/potlatch2/fills/grass.jpg b/public/potlatch2/fills/grass.jpg
deleted file mode 100644
index 26dcd2f78..000000000
Binary files a/public/potlatch2/fills/grass.jpg and /dev/null differ
diff --git a/public/potlatch2/icons/accommodation_alpinehut.n.16.png b/public/potlatch2/icons/accommodation_alpinehut.n.16.png
deleted file mode 100644
index 2fdad623b..000000000
Binary files a/public/potlatch2/icons/accommodation_alpinehut.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png b/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png
deleted file mode 100644
index ab2d3bef4..000000000
Binary files a/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/accommodation_camping.n.16.png b/public/potlatch2/icons/accommodation_camping.n.16.png
deleted file mode 100644
index b2e7a24e5..000000000
Binary files a/public/potlatch2/icons/accommodation_camping.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/accommodation_caravan_park.n.16.png b/public/potlatch2/icons/accommodation_caravan_park.n.16.png
deleted file mode 100644
index aeae7df3c..000000000
Binary files a/public/potlatch2/icons/accommodation_caravan_park.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/accommodation_hotel.n.16.png b/public/potlatch2/icons/accommodation_hotel.n.16.png
deleted file mode 100644
index 4c3bb706c..000000000
Binary files a/public/potlatch2/icons/accommodation_hotel.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/accommodation_youth_hostel.n.16.png b/public/potlatch2/icons/accommodation_youth_hostel.n.16.png
deleted file mode 100644
index d2ca4feed..000000000
Binary files a/public/potlatch2/icons/accommodation_youth_hostel.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/airport.png b/public/potlatch2/icons/airport.png
deleted file mode 100644
index b104403d1..000000000
Binary files a/public/potlatch2/icons/airport.png and /dev/null differ
diff --git a/public/potlatch2/icons/amenity_firestation2.n.16.png b/public/potlatch2/icons/amenity_firestation2.n.16.png
deleted file mode 100644
index 8a980bef0..000000000
Binary files a/public/potlatch2/icons/amenity_firestation2.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/amenity_police2.n.16.png b/public/potlatch2/icons/amenity_police2.n.16.png
deleted file mode 100644
index b2a4aab5c..000000000
Binary files a/public/potlatch2/icons/amenity_police2.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/amenity_post_box.n.16.png b/public/potlatch2/icons/amenity_post_box.n.16.png
deleted file mode 100644
index f72efcf7e..000000000
Binary files a/public/potlatch2/icons/amenity_post_box.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/amenity_recycling.n.16.png b/public/potlatch2/icons/amenity_recycling.n.16.png
deleted file mode 100644
index 567779b2b..000000000
Binary files a/public/potlatch2/icons/amenity_recycling.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/atm.png b/public/potlatch2/icons/atm.png
deleted file mode 100644
index 6a953d348..000000000
Binary files a/public/potlatch2/icons/atm.png and /dev/null differ
diff --git a/public/potlatch2/icons/bank.png b/public/potlatch2/icons/bank.png
deleted file mode 100644
index 6a953d348..000000000
Binary files a/public/potlatch2/icons/bank.png and /dev/null differ
diff --git a/public/potlatch2/icons/bar.png b/public/potlatch2/icons/bar.png
deleted file mode 100644
index 13f97e359..000000000
Binary files a/public/potlatch2/icons/bar.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_blocks.16.png b/public/potlatch2/icons/barrier_blocks.16.png
deleted file mode 100644
index f8fda705d..000000000
Binary files a/public/potlatch2/icons/barrier_blocks.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_bollard.n.16.png b/public/potlatch2/icons/barrier_bollard.n.16.png
deleted file mode 100644
index 989feae56..000000000
Binary files a/public/potlatch2/icons/barrier_bollard.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_cattle_grid.16.png b/public/potlatch2/icons/barrier_cattle_grid.16.png
deleted file mode 100644
index 117bb80ba..000000000
Binary files a/public/potlatch2/icons/barrier_cattle_grid.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_cycle_barrier.16.png b/public/potlatch2/icons/barrier_cycle_barrier.16.png
deleted file mode 100644
index 8afe098ef..000000000
Binary files a/public/potlatch2/icons/barrier_cycle_barrier.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_gate.n.16.png b/public/potlatch2/icons/barrier_gate.n.16.png
deleted file mode 100644
index f8c2f58a8..000000000
Binary files a/public/potlatch2/icons/barrier_gate.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_kissing_gate.16.png b/public/potlatch2/icons/barrier_kissing_gate.16.png
deleted file mode 100644
index 7acc51926..000000000
Binary files a/public/potlatch2/icons/barrier_kissing_gate.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_lift_gate.n.16.png b/public/potlatch2/icons/barrier_lift_gate.n.16.png
deleted file mode 100644
index 80ef74bd7..000000000
Binary files a/public/potlatch2/icons/barrier_lift_gate.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_stile.n.16.png b/public/potlatch2/icons/barrier_stile.n.16.png
deleted file mode 100644
index 3b18ae701..000000000
Binary files a/public/potlatch2/icons/barrier_stile.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/barrier_toll_booth.n.16.png b/public/potlatch2/icons/barrier_toll_booth.n.16.png
deleted file mode 100644
index cc78d874e..000000000
Binary files a/public/potlatch2/icons/barrier_toll_booth.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/bus_stop.png b/public/potlatch2/icons/bus_stop.png
deleted file mode 100644
index 989e9c382..000000000
Binary files a/public/potlatch2/icons/bus_stop.png and /dev/null differ
diff --git a/public/potlatch2/icons/cafe.png b/public/potlatch2/icons/cafe.png
deleted file mode 100644
index d9c1f77f6..000000000
Binary files a/public/potlatch2/icons/cafe.png and /dev/null differ
diff --git a/public/potlatch2/icons/cattle_grid.png b/public/potlatch2/icons/cattle_grid.png
deleted file mode 100644
index b5e4ddc13..000000000
Binary files a/public/potlatch2/icons/cattle_grid.png and /dev/null differ
diff --git a/public/potlatch2/icons/cinema.png b/public/potlatch2/icons/cinema.png
deleted file mode 100644
index f43cabab2..000000000
Binary files a/public/potlatch2/icons/cinema.png and /dev/null differ
diff --git a/public/potlatch2/icons/convenience.png b/public/potlatch2/icons/convenience.png
deleted file mode 100644
index ad6cd2c86..000000000
Binary files a/public/potlatch2/icons/convenience.png and /dev/null differ
diff --git a/public/potlatch2/icons/education_school.n.16.png b/public/potlatch2/icons/education_school.n.16.png
deleted file mode 100644
index a93e2d3cf..000000000
Binary files a/public/potlatch2/icons/education_school.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/fast_food.png b/public/potlatch2/icons/fast_food.png
deleted file mode 100644
index ad2c39cc4..000000000
Binary files a/public/potlatch2/icons/fast_food.png and /dev/null differ
diff --git a/public/potlatch2/icons/ferry_terminal.png b/public/potlatch2/icons/ferry_terminal.png
deleted file mode 100644
index f387c03d8..000000000
Binary files a/public/potlatch2/icons/ferry_terminal.png and /dev/null differ
diff --git a/public/potlatch2/icons/fire_station.png b/public/potlatch2/icons/fire_station.png
deleted file mode 100644
index 897c526fc..000000000
Binary files a/public/potlatch2/icons/fire_station.png and /dev/null differ
diff --git a/public/potlatch2/icons/food_bar.n.16.png b/public/potlatch2/icons/food_bar.n.16.png
deleted file mode 100644
index fadd3e268..000000000
Binary files a/public/potlatch2/icons/food_bar.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/food_cafe.n.16.png b/public/potlatch2/icons/food_cafe.n.16.png
deleted file mode 100644
index d5cc5a86f..000000000
Binary files a/public/potlatch2/icons/food_cafe.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/food_fastfood.n.16.png b/public/potlatch2/icons/food_fastfood.n.16.png
deleted file mode 100644
index 075fc803a..000000000
Binary files a/public/potlatch2/icons/food_fastfood.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/food_pub.n.16.png b/public/potlatch2/icons/food_pub.n.16.png
deleted file mode 100644
index c3d339de5..000000000
Binary files a/public/potlatch2/icons/food_pub.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/food_restaurant.n.16.png b/public/potlatch2/icons/food_restaurant.n.16.png
deleted file mode 100644
index 30682b2cf..000000000
Binary files a/public/potlatch2/icons/food_restaurant.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/gate.png b/public/potlatch2/icons/gate.png
deleted file mode 100644
index b33e55625..000000000
Binary files a/public/potlatch2/icons/gate.png and /dev/null differ
diff --git a/public/potlatch2/icons/health_hospital.n.16.png b/public/potlatch2/icons/health_hospital.n.16.png
deleted file mode 100644
index 41ad28dd4..000000000
Binary files a/public/potlatch2/icons/health_hospital.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/health_pharmacy.n.16.png b/public/potlatch2/icons/health_pharmacy.n.16.png
deleted file mode 100644
index 1827b0a69..000000000
Binary files a/public/potlatch2/icons/health_pharmacy.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/hospital.png b/public/potlatch2/icons/hospital.png
deleted file mode 100644
index 6cc0380db..000000000
Binary files a/public/potlatch2/icons/hospital.png and /dev/null differ
diff --git a/public/potlatch2/icons/hotel.png b/public/potlatch2/icons/hotel.png
deleted file mode 100644
index f951247cf..000000000
Binary files a/public/potlatch2/icons/hotel.png and /dev/null differ
diff --git a/public/potlatch2/icons/icons_grid.png b/public/potlatch2/icons/icons_grid.png
deleted file mode 100644
index 9b6d628de..000000000
Binary files a/public/potlatch2/icons/icons_grid.png and /dev/null differ
diff --git a/public/potlatch2/icons/logo_nls70-nq8.png b/public/potlatch2/icons/logo_nls70-nq8.png
deleted file mode 100644
index d845d8539..000000000
Binary files a/public/potlatch2/icons/logo_nls70-nq8.png and /dev/null differ
diff --git a/public/potlatch2/icons/money_atm.n.16.png b/public/potlatch2/icons/money_atm.n.16.png
deleted file mode 100644
index 8656f0c44..000000000
Binary files a/public/potlatch2/icons/money_atm.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/money_bank2.n.16.png b/public/potlatch2/icons/money_bank2.n.16.png
deleted file mode 100644
index 7264bcbc6..000000000
Binary files a/public/potlatch2/icons/money_bank2.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/museum.png b/public/potlatch2/icons/museum.png
deleted file mode 100644
index 79346ab2b..000000000
Binary files a/public/potlatch2/icons/museum.png and /dev/null differ
diff --git a/public/potlatch2/icons/natural_blank.png b/public/potlatch2/icons/natural_blank.png
deleted file mode 100644
index 33e76fba0..000000000
Binary files a/public/potlatch2/icons/natural_blank.png and /dev/null differ
diff --git a/public/potlatch2/icons/parking.png b/public/potlatch2/icons/parking.png
deleted file mode 100644
index a2675d018..000000000
Binary files a/public/potlatch2/icons/parking.png and /dev/null differ
diff --git a/public/potlatch2/icons/parking_cycle.png b/public/potlatch2/icons/parking_cycle.png
deleted file mode 100644
index a2675d018..000000000
Binary files a/public/potlatch2/icons/parking_cycle.png and /dev/null differ
diff --git a/public/potlatch2/icons/pharmacy.png b/public/potlatch2/icons/pharmacy.png
deleted file mode 100644
index 5254d93b5..000000000
Binary files a/public/potlatch2/icons/pharmacy.png and /dev/null differ
diff --git a/public/potlatch2/icons/pharmacy_dispensing.png b/public/potlatch2/icons/pharmacy_dispensing.png
deleted file mode 100644
index 9e3a4c5ff..000000000
Binary files a/public/potlatch2/icons/pharmacy_dispensing.png and /dev/null differ
diff --git a/public/potlatch2/icons/place.png b/public/potlatch2/icons/place.png
deleted file mode 100644
index 488218c07..000000000
Binary files a/public/potlatch2/icons/place.png and /dev/null differ
diff --git a/public/potlatch2/icons/place_of_worship.png b/public/potlatch2/icons/place_of_worship.png
deleted file mode 100644
index 3ef2b4388..000000000
Binary files a/public/potlatch2/icons/place_of_worship.png and /dev/null differ
diff --git a/public/potlatch2/icons/police.png b/public/potlatch2/icons/police.png
deleted file mode 100644
index da271d398..000000000
Binary files a/public/potlatch2/icons/police.png and /dev/null differ
diff --git a/public/potlatch2/icons/post_box.png b/public/potlatch2/icons/post_box.png
deleted file mode 100644
index 8690ebb6e..000000000
Binary files a/public/potlatch2/icons/post_box.png and /dev/null differ
diff --git a/public/potlatch2/icons/pub.png b/public/potlatch2/icons/pub.png
deleted file mode 100644
index b03e915ba..000000000
Binary files a/public/potlatch2/icons/pub.png and /dev/null differ
diff --git a/public/potlatch2/icons/recycling.png b/public/potlatch2/icons/recycling.png
deleted file mode 100644
index aa613d510..000000000
Binary files a/public/potlatch2/icons/recycling.png and /dev/null differ
diff --git a/public/potlatch2/icons/restaurant.png b/public/potlatch2/icons/restaurant.png
deleted file mode 100644
index 5b6da1444..000000000
Binary files a/public/potlatch2/icons/restaurant.png and /dev/null differ
diff --git a/public/potlatch2/icons/restriction.png b/public/potlatch2/icons/restriction.png
deleted file mode 100644
index 45671d4ae..000000000
Binary files a/public/potlatch2/icons/restriction.png and /dev/null differ
diff --git a/public/potlatch2/icons/school.png b/public/potlatch2/icons/school.png
deleted file mode 100644
index 1067beb88..000000000
Binary files a/public/potlatch2/icons/school.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_alcohol.n.16.png b/public/potlatch2/icons/shopping_alcohol.n.16.png
deleted file mode 100644
index 205100225..000000000
Binary files a/public/potlatch2/icons/shopping_alcohol.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_bakery.n.16.png b/public/potlatch2/icons/shopping_bakery.n.16.png
deleted file mode 100644
index 76a52d2d6..000000000
Binary files a/public/potlatch2/icons/shopping_bakery.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_bicycle.n.16.png b/public/potlatch2/icons/shopping_bicycle.n.16.png
deleted file mode 100644
index ef5b36624..000000000
Binary files a/public/potlatch2/icons/shopping_bicycle.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_book.n.16.png b/public/potlatch2/icons/shopping_book.n.16.png
deleted file mode 100644
index 172bd286f..000000000
Binary files a/public/potlatch2/icons/shopping_book.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_butcher.n.16.png b/public/potlatch2/icons/shopping_butcher.n.16.png
deleted file mode 100644
index b48859182..000000000
Binary files a/public/potlatch2/icons/shopping_butcher.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_car.n.16.png b/public/potlatch2/icons/shopping_car.n.16.png
deleted file mode 100644
index d80076058..000000000
Binary files a/public/potlatch2/icons/shopping_car.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_car_repair.n.16.png b/public/potlatch2/icons/shopping_car_repair.n.16.png
deleted file mode 100644
index 78c578d71..000000000
Binary files a/public/potlatch2/icons/shopping_car_repair.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_clothes.n.16.png b/public/potlatch2/icons/shopping_clothes.n.16.png
deleted file mode 100644
index d467b786e..000000000
Binary files a/public/potlatch2/icons/shopping_clothes.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_confectionery.n.16.png b/public/potlatch2/icons/shopping_confectionery.n.16.png
deleted file mode 100644
index b293dfdc7..000000000
Binary files a/public/potlatch2/icons/shopping_confectionery.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_convenience.n.16.png b/public/potlatch2/icons/shopping_convenience.n.16.png
deleted file mode 100644
index 40fa49d9c..000000000
Binary files a/public/potlatch2/icons/shopping_convenience.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_diy.n.16.png b/public/potlatch2/icons/shopping_diy.n.16.png
deleted file mode 100644
index 045696cad..000000000
Binary files a/public/potlatch2/icons/shopping_diy.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_fish.n.16.png b/public/potlatch2/icons/shopping_fish.n.16.png
deleted file mode 100644
index f49d4e9f1..000000000
Binary files a/public/potlatch2/icons/shopping_fish.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_garden_centre.n.16.png b/public/potlatch2/icons/shopping_garden_centre.n.16.png
deleted file mode 100644
index 7af4465d0..000000000
Binary files a/public/potlatch2/icons/shopping_garden_centre.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_gift.n.16.png b/public/potlatch2/icons/shopping_gift.n.16.png
deleted file mode 100644
index 2d11d0417..000000000
Binary files a/public/potlatch2/icons/shopping_gift.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_greengrocer.n.16.png b/public/potlatch2/icons/shopping_greengrocer.n.16.png
deleted file mode 100644
index 7d60e3598..000000000
Binary files a/public/potlatch2/icons/shopping_greengrocer.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_hairdresser.n.16.png b/public/potlatch2/icons/shopping_hairdresser.n.16.png
deleted file mode 100644
index bcb07fdfe..000000000
Binary files a/public/potlatch2/icons/shopping_hairdresser.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_hifi.n.16.png b/public/potlatch2/icons/shopping_hifi.n.16.png
deleted file mode 100644
index f55ad666f..000000000
Binary files a/public/potlatch2/icons/shopping_hifi.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_jewelry.n.16.png b/public/potlatch2/icons/shopping_jewelry.n.16.png
deleted file mode 100644
index 49ee19c29..000000000
Binary files a/public/potlatch2/icons/shopping_jewelry.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_laundrette.n.16.png b/public/potlatch2/icons/shopping_laundrette.n.16.png
deleted file mode 100644
index 266660a2d..000000000
Binary files a/public/potlatch2/icons/shopping_laundrette.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_motorcycle.n.16.png b/public/potlatch2/icons/shopping_motorcycle.n.16.png
deleted file mode 100644
index 8f7ddff0f..000000000
Binary files a/public/potlatch2/icons/shopping_motorcycle.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_music.n.16.png b/public/potlatch2/icons/shopping_music.n.16.png
deleted file mode 100644
index 8e875c7f7..000000000
Binary files a/public/potlatch2/icons/shopping_music.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/shopping_supermarket.n.16.png b/public/potlatch2/icons/shopping_supermarket.n.16.png
deleted file mode 100644
index f4dc6d1e2..000000000
Binary files a/public/potlatch2/icons/shopping_supermarket.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/speed_hump_16.png b/public/potlatch2/icons/speed_hump_16.png
deleted file mode 100644
index 410769237..000000000
Binary files a/public/potlatch2/icons/speed_hump_16.png and /dev/null differ
diff --git a/public/potlatch2/icons/station.png b/public/potlatch2/icons/station.png
deleted file mode 100644
index 1e198259e..000000000
Binary files a/public/potlatch2/icons/station.png and /dev/null differ
diff --git a/public/potlatch2/icons/supermarket.png b/public/potlatch2/icons/supermarket.png
deleted file mode 100644
index 04944d16a..000000000
Binary files a/public/potlatch2/icons/supermarket.png and /dev/null differ
diff --git a/public/potlatch2/icons/taxi.png b/public/potlatch2/icons/taxi.png
deleted file mode 100644
index 42c6f9203..000000000
Binary files a/public/potlatch2/icons/taxi.png and /dev/null differ
diff --git a/public/potlatch2/icons/telephone.png b/public/potlatch2/icons/telephone.png
deleted file mode 100644
index c2a2d6242..000000000
Binary files a/public/potlatch2/icons/telephone.png and /dev/null differ
diff --git a/public/potlatch2/icons/theatre.png b/public/potlatch2/icons/theatre.png
deleted file mode 100644
index 897a1e145..000000000
Binary files a/public/potlatch2/icons/theatre.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_archaeological.n.16.png b/public/potlatch2/icons/tourist_archaeological.n.16.png
deleted file mode 100644
index 87c49763e..000000000
Binary files a/public/potlatch2/icons/tourist_archaeological.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_battlefield.n.16.png b/public/potlatch2/icons/tourist_battlefield.n.16.png
deleted file mode 100644
index d96688929..000000000
Binary files a/public/potlatch2/icons/tourist_battlefield.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_castle.n.16.png b/public/potlatch2/icons/tourist_castle.n.16.png
deleted file mode 100644
index bd9a42bf0..000000000
Binary files a/public/potlatch2/icons/tourist_castle.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_cinema.n.16.png b/public/potlatch2/icons/tourist_cinema.n.16.png
deleted file mode 100644
index 42f281523..000000000
Binary files a/public/potlatch2/icons/tourist_cinema.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_information.png b/public/potlatch2/icons/tourist_information.png
deleted file mode 100644
index ccfbe7e49..000000000
Binary files a/public/potlatch2/icons/tourist_information.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_memorial.n.16.png b/public/potlatch2/icons/tourist_memorial.n.16.png
deleted file mode 100644
index 944e27b10..000000000
Binary files a/public/potlatch2/icons/tourist_memorial.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_monument.n.16.png b/public/potlatch2/icons/tourist_monument.n.16.png
deleted file mode 100644
index 8b7e7f81a..000000000
Binary files a/public/potlatch2/icons/tourist_monument.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_museum.n.16.png b/public/potlatch2/icons/tourist_museum.n.16.png
deleted file mode 100644
index 36a4c450b..000000000
Binary files a/public/potlatch2/icons/tourist_museum.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_picnic.n.16.png b/public/potlatch2/icons/tourist_picnic.n.16.png
deleted file mode 100644
index f52923649..000000000
Binary files a/public/potlatch2/icons/tourist_picnic.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_ruin.n.16.png b/public/potlatch2/icons/tourist_ruin.n.16.png
deleted file mode 100644
index 65ad843db..000000000
Binary files a/public/potlatch2/icons/tourist_ruin.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_theatre.n.16.png b/public/potlatch2/icons/tourist_theatre.n.16.png
deleted file mode 100644
index c0c82dfdd..000000000
Binary files a/public/potlatch2/icons/tourist_theatre.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_view_point.n.16.png b/public/potlatch2/icons/tourist_view_point.n.16.png
deleted file mode 100644
index 781e74990..000000000
Binary files a/public/potlatch2/icons/tourist_view_point.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_zoo.n.16.png b/public/potlatch2/icons/tourist_zoo.n.16.png
deleted file mode 100644
index 2a9ecb088..000000000
Binary files a/public/potlatch2/icons/tourist_zoo.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_aerodrome.n.16.png b/public/potlatch2/icons/transport_aerodrome.n.16.png
deleted file mode 100644
index a86124b20..000000000
Binary files a/public/potlatch2/icons/transport_aerodrome.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_bus_station.n.16.png b/public/potlatch2/icons/transport_bus_station.n.16.png
deleted file mode 100644
index aa93c115b..000000000
Binary files a/public/potlatch2/icons/transport_bus_station.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_bus_stop2.n.16.png b/public/potlatch2/icons/transport_bus_stop2.n.16.png
deleted file mode 100644
index 81fe31f34..000000000
Binary files a/public/potlatch2/icons/transport_bus_stop2.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_car_wash.n.16.png b/public/potlatch2/icons/transport_car_wash.n.16.png
deleted file mode 100644
index 07acd4ec6..000000000
Binary files a/public/potlatch2/icons/transport_car_wash.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_fuel.n.16.png b/public/potlatch2/icons/transport_fuel.n.16.png
deleted file mode 100644
index 1571502e4..000000000
Binary files a/public/potlatch2/icons/transport_fuel.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_marina.n.16.png b/public/potlatch2/icons/transport_marina.n.16.png
deleted file mode 100644
index 796005631..000000000
Binary files a/public/potlatch2/icons/transport_marina.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_parking_bicycle.n.16.png b/public/potlatch2/icons/transport_parking_bicycle.n.16.png
deleted file mode 100644
index dfd7f83dd..000000000
Binary files a/public/potlatch2/icons/transport_parking_bicycle.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_parking_car.n.16.png b/public/potlatch2/icons/transport_parking_car.n.16.png
deleted file mode 100644
index 567c4f551..000000000
Binary files a/public/potlatch2/icons/transport_parking_car.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_port.n.16.png b/public/potlatch2/icons/transport_port.n.16.png
deleted file mode 100644
index 471c4daa5..000000000
Binary files a/public/potlatch2/icons/transport_port.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_rental_bicycle.n.16.png b/public/potlatch2/icons/transport_rental_bicycle.n.16.png
deleted file mode 100644
index 6659d1e16..000000000
Binary files a/public/potlatch2/icons/transport_rental_bicycle.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_rental_car.n.16.png b/public/potlatch2/icons/transport_rental_car.n.16.png
deleted file mode 100644
index 0c9f7b470..000000000
Binary files a/public/potlatch2/icons/transport_rental_car.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_taxi_rank.n.16.png b/public/potlatch2/icons/transport_taxi_rank.n.16.png
deleted file mode 100644
index 23e6f1b16..000000000
Binary files a/public/potlatch2/icons/transport_taxi_rank.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_train_station.n.16.png b/public/potlatch2/icons/transport_train_station.n.16.png
deleted file mode 100644
index 29ddcc122..000000000
Binary files a/public/potlatch2/icons/transport_train_station.n.16.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_tram_stop.n.16.png b/public/potlatch2/icons/transport_tram_stop.n.16.png
deleted file mode 100644
index ddbbc4c5c..000000000
Binary files a/public/potlatch2/icons/transport_tram_stop.n.16.png and /dev/null differ
diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
deleted file mode 100644
index a916c984a..000000000
--- a/public/potlatch2/imagery.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<imagery>
-	<set>
-		<name>Bing aerial imagery</name>
-		<url>http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&mkt=en-gb&n=z</url>
-		<scheme>microsoft</scheme>
-		<sourcetag>Bing</sourcetag>
-		<attribution_url>http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&mapVersion=v1&key=Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU&include=ImageryProviders&output=xml</attribution_url>
-		<logo>bing_maps.png</logo>
-		<logo_url>http://www.bing.com/maps</logo_url>
-		<terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url>
-		<default>yes</default>
-	</set>
-    <set>
-        <name>MapQuest Open Aerial</name>
-        <url>http://oatile1.mqcdn.com/naip/$z/$x/$y.png</url>
-    </set>
-	<set>
-		<name>OSM - Mapnik</name>
-		<url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url>
-	</set>
-	<set>
-		<name>OSM - Osmarender</name>
-		<url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
-	</set>
-    <set>
-        <name>OSM - OpenCycleMap</name>
-        <url>http://tile.opencyclemap.org/cycle/$z/$x/$y.png</url>
-    </set>
-    <set>
-        <name>OSM - MapQuest</name>
-        <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url>
-    </set>
-    <set minlat="17" minlon="175" maxlat="72" maxlon="-46">
-      <name>OSM - Tiger Edited Map</name>
-      <type>900913</type>
-      <url>http://tiger-osm.mapquest.com/tiles/1.0.0/tiger/$z/$x/$y.png</url>
-    </set>
-	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
-		<name>OS OpenData Streetview</name>
-		<url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
-		<sourcetag>OS_OpenData_StreetView</sourcetag>
-	</set>
-	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
-		<name>OS OpenData Locator</name>
-		<url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
-		<sourcetag>OS_OpenData_Locator</sourcetag>
-		<sourcekey>source:name</sourcekey>
-	</set>
-	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
-		<name>OS 1:25k historic</name>
-		<url>http://ooc.openstreetmap.org/os1/$z/$x/$y.jpg</url>
-		<sourcetag>OS 1:25k</sourcetag>
-	</set>
-	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
-		<name>OS 7th Series historic</name>
-		<url>http://ooc.openstreetmap.org/os7/$z/$x/$y.jpg</url>
-		<sourcetag>OS7</sourcetag>
-	</set>
-	<set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">
-		<name>OS New Popular Edition historic</name>
-		<url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url>
-		<sourcetag>NPE</sourcetag>
-	</set>
-	<set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
-		<name>OS Scottish Popular historic</name>
-		<url>http://ooc.openstreetmap.org/npescotland/tiles/$z/$x/$y.jpg</url>
-		<sourcetag>NPE</sourcetag>
-	</set>
-	<set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">
-		<name>Surrey aerial</name>
-		<url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url>
-		<sourcetag>Surrey aerial</sourcetag>
-	</set>
-	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
-		<name>Haiti - GeoEye Jan 13</name>
-		<url>http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg</url>
-		<sourcetag>Haiti GeoEye</sourcetag>
-	</set>
-	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
-		<name>Haiti - GeoEye Jan 13+</name>
-		<url>http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg</url>
-		<sourcetag>Haiti GeoEye</sourcetag>
-	</set>
-	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
-		<name>Haiti - DigitalGlobe</name>
-		<url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url>
-		<sourcetag>Haiti DigitalGlobe</sourcetag>
-	</set>
-	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
-		<name>Haiti - Street names</name>
-		<url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url>
-		<sourcetag>Haiti streetnames</sourcetag>
-	</set>
-	<set minlat="24.2" minlon="-125.8" maxlat="49.5" maxlon="-62.3">
-		<name>National Agriculture Imagery Program</name>
-		<url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
-		<sourcetag>NAIP</sourcetag>
-	</set>
-	<set minlat="55.3" minlon="-168.5" maxlat="71.5" maxlon="-140">
-		<name>National Agriculture Imagery Program</name>
-		<url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
-		<sourcetag>NAIP</sourcetag>
-	</set>
-	<set minlat='51.32' minlon='-10.71' maxlat='55.46' maxlon='-5.37'>
-		<name>Ireland - NLS Historic Maps</name>
-		<scheme>tms</scheme>
-		<sourcetag>NLS Historic Maps</sourcetag>
-		<url>http://geo.nls.uk/maps/ireland/gsgs4136/$z/$x/$y.png</url>
-		<logo>icons/logo_nls70-nq8.png</logo>
-		<logo_url>http://geo.nls.uk/maps/</logo_url>
-	</set>
-	<set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
-		<name>Denmark - Fugro Aerial Imagery</name>
-		<url>http://tile.openstreetmap.dk/fugro2005/$z/$x/$y.jpg</url>
-		<sourcetag>Fugro (2005)</sourcetag>
-	</set>
-	<set minlat="55.23403" minlon="12.09144" maxlat="55.43647" maxlon="12.47712">
-		<name>Denmark - Stevns Kommune</name>
-		<url>http://tile.openstreetmap.dk/stevns/2009/$z/$x/$y.jpg</url>
-		<sourcetag>Stevns Kommune (2009)</sourcetag>
-    </set>
-	<set minlat="46.33" minlon="9.36" maxlat="49.09" maxlon="17.28">
-		<name>Austria - geoimage.at</name>
-		<url>http://geoimage.openstreetmap.at/4d80de696cd562a63ce463a58a61488d/$z/$x/$y.jpg</url>
-		<sourcetag>geoimage.at</sourcetag>
-	</set>
-	<set minlon="19.02" minlat="40.96" maxlon="77.34" maxlat="70.48">
-		<name>Russia - Kosmosnimki.ru IRS Satellite</name>
-		<url>http://irs.gis-lab.info/?layers=irs&request=GetTile&z=$z&x=$x&y=$y</url>
-		<sourcetag>Kosmosnimki.ru IRS</sourcetag>
-	</set>
-	<set minlon="23.16" minlat="51.25" maxlon="32.83" maxlat="56.19">
-		<name>Belarus - Kosmosnimki.ru SPOT4 Satellite</name>
-		<url>http://irs.gis-lab.info/?layers=spot&request=GetTile&z=$z&x=$x&y=$y</url>
-		<sourcetag>Kosmosnimki.ru SPOT4</sourcetag>
-	</set>
-	<set minlon="96" minlat="-44" maxlon="168" maxlat="-9">
-		<name>Australia - Geographic Reference Image</name>
-		<url>http://agri.openstreetmap.org/$z/$x/$y.png</url>
-		<sourcetag>AGRI</sourcetag>
-	</set>
-</imagery>
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
deleted file mode 100644
index fbc4a3986..000000000
--- a/public/potlatch2/map_features.xml
+++ /dev/null
@@ -1,688 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	See http://wiki.openstreetmap.org/wiki/Potlatch_2/Developer_Documentation/Map_Features for documentation.
-	Files can be included like this: <include file="map_features/roads.xml">
--->
-
-<mapFeatures>
-
-  <!-- Categories -->
-  <category name="Roads" id="roads"/>
-  <category name="Paths" id="paths"/>
-  <category name="Shopping" id="shopping"/>
-  <category name="Food and Drink" id="foodanddrink"/>
-  <category name="Amenity" id="amenity"/>
-  <category name="Tourism" id="tourism"/>
-  <category name="Accommodation" id="accommodation"/>
-  <category name="Transport" id="transport"/>
-  <category name="Water" id="water"/>
-  <category name="Natural" id="natural"/>
-  <category name="Barrier" id="barrier"/>
-  <category name="Power" id="power"/>
-  <category name="Admin" id="admin"/>
-  <category name="Buildings" id="buildings"/>
-  <category name="Landuse" id="landuse"/>
-  <category name="Agriculture" id="agriculture"/>
-  <category name="Advanced" id="advanced"/>
-  <category name="Places" id="places"/>
-  <category name="Sport and Leisure" id="sport"/>
-  <category name="Man-made" id="manmade"/>
-
-  <!-- Common input sets -->
-
-  <inputSet id="simpleName">
-    <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest"/>
-  </inputSet>
-
-  <inputSet id="nameAndRef">
-    <inputSet ref="simpleName" />
-    <input type="freetext" presence="always" name="Reference number" key="ref" description="A reference number or code used to identify this thing." />
-  </inputSet>
-
-   <inputSet id="simpleBrand"> 
-     <input type="freetext" category="Naming" presence="always" name="Brand" key="brand" description="Brand, i.e. Acme"/> 
-   </inputSet> 
-  
-   <inputSet id="simpleOperator"> 
-     <input type="freetext" category="Naming" presence="always" name="Operator" key="operator" description="Operator, i.e. Acme Springfield Ltd"/> 
-   </inputSet> 
-
-  <inputSet id="source">
-    <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Bing, ...)" priority="lowest"/>
-  </inputSet>
-
-  <inputSet id="designation">
-    <input type="freetext" category="Details" presence="onTagMatch" description="Official designation or classification" name="Designation" key="designation" priority="lowest" />
-  </inputSet>
-
-  <inputSet id="common">
-    <inputSet ref="source"/>
-    <inputSet ref="designation"/>
-  </inputSet>
-
-  <inputSet id="names">
-    <input type="freetext" presence="always"
-        name="Name" category="Details" priority="highest"
-        key="name" description="The most common name"/>
-    <input type="freetext" presence="onTagMatch"
-        name="International Name" category="Details" subcategory="Additional names"
-        key="int_name" description="The internationally recognised name"/>
-    <input type="freetext" presence="onTagMatch"
-        name="Historical Name" category="Details" subcategory="Additional names" priority="low"
-        key="old_name" description="The historic or previous name"/>
-    <input type="freetext" presence="onTagMatch"
-        name="Alternative Name" category="Details" subcategory="Additional names" priority="low"
-        key="alt_name" description="An alternative, currently used, name"/>
-  </inputSet>
-
-  <inputSet id="wifi">
-    <input type="choice" presence="onTagMatch" category="Details" name="Wifi" key="wifi">
-      <choice value="free" text="Free"/>
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="buildingAddress">
-    <input type="freetext" presence="onTagMatch" category="Address" description="The number of the house, e.g. 156 or 10-12" name="House Number" key="addr:housenumber"/>
-    <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="addr:housename"/>
-    <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/>
-    <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/>
-  </inputSet>
-
-  <inputSet id="web">
-    <input type="freetext" presence="onTagMatch" category="Address" description="The URL of the website" name="Website" key="website"/>
-  </inputSet>
-
-  <inputSet id="cuisine">
-    <input type="choice" presence="always" name="Cuisine" category="Details" description="The type of food that they serve" key="cuisine">
-      <!-- The 30 most popular values according to taginfo 23/12/2010 -->
-      <choice value="burger" text="Burger"/>
-      <choice value="chicken" text="Chicken"/>
-      <choice value="chinese" text="Chinese"/>
-      <choice value="coffee_shop" text="Coffee Shop"/>
-      <choice value="greek" text="Greek"/>
-      <choice value="pizza" text="Pizza"/>
-      <choice value="sandwich" text="Sandwich"/>
-      <choice value="seafood" text="Sea Food"/>
-      <choice value="regional" text="Regional"/>
-      <choice value="italian" text="Italian"/>
-      <choice value="german" text="German"/>
-      <choice value="kebab" text="Kebab/souvlaki/gyro"/>
-      <choice value="indian" text="Indian"/>
-      <choice value="asian" text="Asian"/>
-      <choice value="mexican" text="Mexican"/>
-      <choice value="thai" text="Thai"/>
-      <choice value="japanese" text="Japanese"/>
-      <choice value="ice_cream" text="Ice-cream"/>
-      <choice value="fish_and_chips" text="Fish &amp; Chips"/>
-      <choice value="turkish" text="Turkish"/>
-      <choice value="french" text="French"/>
-      <choice value="sushi" text="Sushi"/>
-      <choice value="american" text="American"/>
-      <choice value="steak_house" text="Steak House"/>
-      <choice value="international" text="International"/>
-      <choice value="spanish" text="Spanish"/>
-      <choice value="vietnamese" text="Vietnamese"/>
-      <choice value="fish" text="Fish"/>
-      <choice value="bavarian" text="Bavarian"/>
-      <choice value="vegetarian" text="Vegetarian"/>
-
-      <help>http://wiki.openstreetmap.org/wiki/Key:cuisine</help>
-    </input>
-  </inputSet>
-
-  <!-- Roads -->
-
-  <inputSet id="majorRoad">
-    <inputSet ref="names"/>
-    <inputSet ref="roadRefs"/>
-    <inputSet ref="roadRestrictions"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="cycle"/>
-    <inputSet ref="bicycle-lane"/>
-    <inputSet ref="bus-route"/>
-    <inputSet ref="tram-route"/>
-    <inputSet ref="pedestrians"/>
-    <inputSet ref="roadLanes"/>
-    <inputSet ref="roadRoundabout"/>
-    <inputSet ref="permissions"/>
-  </inputSet>
-  
-
-  <inputSet id="minorRoad">
-    <inputSet ref="names"/>
-    <inputSet ref="roadRestrictions"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="cycle"/>
-    <inputSet ref="bicycle-lane"/>
-    <inputSet ref="bus-route"/>
-    <inputSet ref="tram-route"/>
-    <inputSet ref="pedestrians"/>
-    <inputSet ref="roadLanes"/>
-    <inputSet ref="roadRoundabout"/>
-    <inputSet ref="permissions"/>
-  </inputSet>
-
-  <inputSet id="path">
-    <inputSet ref="simpleName"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="cycle"/>
-    <inputSet ref="ldp"/>
-    <inputSet ref="pedestrians"/>
-    <inputSet ref="permissions"/>
-  </inputSet>
-
-  <inputSet id="junctionNode">
-    <inputSet ref="turnRestrictions"/>
-  </inputSet>
-
-  <inputSet id="roadRefs">
-    <input type="freetext" presence="always"
-        name="Reference" category="Details" priority="high"
-        key="ref" description="The official reference number"/>
-    <input type="freetext" presence="onTagMatch"
-        name="International Reference" category="Details" subcategory="Additional names" 
-        key="int_ref" description="The official international reference number"/>
-    <input type="freetext" presence="onTagMatch"
-        name="Old Reference" category="Details" subcategory="Additional names" priority="low"
-        key="old_ref" description="The historic or previous reference number"/>
-  </inputSet>
-
-  <inputSet id="roadPhysical">
-    <input type="freetext" presence="onTagMatch"
-        name="Width" category="Details" subcategory="Physical" 
-        key="width" description="Width of the road" layout="horizontal"/>
-    <input type="choice" presence="onTagMatch"
-        name="Surface" category="Details" description="Type of road surface"
-        key="surface" layout="horizontal">
-      <choice value="unpaved" text="Unpaved" description="Road surface is unsealed"/>
-      <choice value="paved" text="Paved" description="Road surface is sealed"/>
-      <choice value="asphalt" text="Asphalt"/>
-      <choice value="concrete" text="Concrete"/>
-      <choice value="paving_stones" text="Paving stones"/>
-      <choice value="cobblestone" text="Cobblestone"/>
-      <choice value="sand" text="Sand"/>
-      <choice value="gravel" text="Gravel"/>
-      <choice value="dirt" text="Dirt"/>
-      <choice value="grass" text="Grass"/>
-    </input>
-    <inputSet ref="bridge"/>
-    <inputSet ref="tunnel"/>
-    <inputSet ref="embankment-cutting"/>
-    <!-- not sure which category best suits put area=yes -->
-    <input type="checkbox" presence="onTagMatch" category="Details" subcategory="Physical" key="area" name="Open area" description="The way is a large open space, like at a dock, where vehicles can move anywhere within the space, rather than just along the edge." />
-  </inputSet>
-
-  <inputSet id="roadLanes">
-    <input presence="onTagMatch" type="number" name="Lanes" category="Details" description="Total number of lanes, counting both directions"
-           key="lanes" minimum="1" maximum="10" layout="horizontal"/>
-  </inputSet>
-
-  <inputSet id="bridge">
-    <input type="choice" presence="onTagMatch"
-        name="Bridge" category="Details" description="Road goes over a bridge"
-        key="bridge" layout="horizontal">
-      <choice value="yes" text="Generic Bridge" description="Generic bridge -- type unknown"/>
-      <choice value="viaduct" text="Viaduct" description="Viaduct"/>
-      <choice value="suspension" text="Suspension bridge"/>
-    </input>
-    <input type="slider" presence="onTagMatch"
-        name="Layer" category="Details" description="Relative vertical positions (-5 lowest, +5 highest)"
-        key="layer" minimum="-5" maximum="5" default="0" snapInterval="1" labels="Lowest,Ground,Highest"
-        defaultName="Ground"/>
-  </inputSet>
-  <inputSet id="tunnel">
-    <!-- Not ideal, used for non-roads too. -->  
-    <input type="choice" presence="onTagMatch"
-        name="Tunnel" category="Details" subcategory="Physical" description="Road goes into a tunnel"
-        key="tunnel" layout="horizontal">
-      <choice value="yes" text="Tunnel" description="Generic tunnel"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="embankment-cutting">
-    <input type="choice"
-           name="Embankment" category="Details" subcategory="Physical" description="Road supported on a raised bed of earth and rock."
-           key="embankment" layout="horizontal">
-      <choice value="yes" text="Embankment"/>
-    </input>
-    <input type="choice"
-           name="Cutting" category="Details" subcategory="Physical" description="Road carved out of hill on one or both sides."
-           key="cutting" layout="horizontal">
-      <choice value="yes" text="Cutting"/>
-    </input>
-
-  </inputSet>
-
-  <inputSet id="rail-electrification">
-    <input type="choice" name="Electrified" category="Details" subcategory="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
-           key="electrified">
-      <choice value="yes" text="Yes"/>
-      <choice value="contact_line" text="Overhead line"/>
-      <choice value="rail" text="Third rail"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" name="Voltage" category="Details" subcategory="Electrification" description="Nominal voltage of electric wires"
-           key="voltage" presence="withCategory">
-      <choice value="600" text="600V"/>
-      <choice value="750" text="750V"/>
-      <choice value="1500" text="1500V"/>
-      <choice value="3000" text="3000V"/>
-      <choice value="12000" text="12kV"/>
-      <choice value="15000" text="15kV"/>
-      <choice value="25000" text="25kV"/>
-    </input>
-    <input type="choice" name="Frequency" category="Details" subcategory="Electrification" description="Frequency in Hertz of alternating current power supply"
-           key="frequency" presence="withCategory">
-      <choice value="0" text="DC"/>
-      <choice value="16.67" text="16.67 Hz"/>
-      <choice value="16.7" text="16.7 Hz"/>
-      <choice value="25" text="25 Hz"/>
-      <choice value="50" text="50 Hz"/>
-      <choice value="60" text="60 Hz"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="fee">
-    <input type="freetext" presence="onTagMatch" category="Restrictions" description="The charge/cost of using this amenity" name="Fee" key="fee"/>
-  </inputSet>
-
-  <inputSet id="roadRestrictions">
-    <input type="choice" presence="always"
-        name="Oneway" category="Restrictions" description="Oneway roads"
-        key="oneway">
-      <choice value="yes" match="yes|true|1" text="One way"
-        description="Road can only be travelled in direction of way" icon="features/oneway__yes.png"/>
-      <choice value="no" match="no|false|0" text="Two way"
-        description="Road can be travelled in both directions" icon="features/oneway__no.png"/>
-      <choice value="-1" match="-1|reverse" text="One way reverse"
-        description="Road can be travelled in opposite direction to way" icon="features/oneway__-1.png"/>
-    </input>
-    <input type="speed" presence="onTagMatch"
-        name="Speed Limit" category="Restrictions" description="Maximum permitted speed on this road"
-        key="maxspeed"/>
-  </inputSet>
-
-  <inputSet id="roadRoundabout">
-    <!-- review the choice of category -->
-    <input type="choice" presence="onTagMatch" name="Roundabout" category="Restrictions" description="Whether this road is a roundabout. Make the way face the direction appropriate for the country."
-           key="junction">
-      <choice value="roundabout" text="Yes"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="turnRestrictions">
-    <input type="turn" name="Turn restriction" description="Turn restriction" category="Restrictions" priority="normal" presence="onTagMatch">
-      <match k="type" v="restriction"/>
-      <role role="via"/>
-    </input>
-  </inputSet>
-  
-  <inputSet id="trafficSignals">
-    <!-- can't add as standalone feature due to current limitations, would conflict with junction node feature -->
-    <input type="choice" key="highway" name="Traffic signals" description="Intersection controlled by traffic lights" category="Restrictions" presence="always">
-      <choice value="traffic_signals" text="Yes"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="pedestrians">
-    <input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walk" key="foot">
-      <choice value="yes" text="Allowed"/>
-      <choice value="no" text="Prohibited"/>
-      <choice value="designated" text="Designated"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="naptan">
-    <input type="freetext" presence="onTagMatch" category="Transport" description="12 character internal Naptan ID" name="Atco Code" key="naptan:AtcoCode"/>
-    <input type="choice" presence="onTagMatch" category="Transport" description="The eight-point compass bearning" name="Naptan Bearing" key="naptan:Bearing" >
-      <choice value="N"  match="N"  text="N"  description=""/>
-      <choice value="NE" match="NE" text="NE" description=""/>
-      <choice value="E"  match="E"  text="E"  description=""/>
-      <choice value="SE" match="SE" text="SE" description=""/>
-      <choice value="S"  match="S"  text="S"  description=""/>
-      <choice value="SW" match="SW" text="SW" description=""/>
-      <choice value="W"  match="W"  text="W"  description=""/>
-      <choice value="NW" match="NW" text="NW" description=""/>
-    </input>
-    <input type="freetext" presence="onTagMatch" category="Transport" description="The naptan common name" name="Naptan Common Name (read-only)" key="naptan:CommonName"/>
-    <input type="freetext" presence="onTagMatch" category="Transport" description="" name="Naptan Indicator (read-only)" key="naptan:Indicator"/>
-    <input type="freetext" presence="onTagMatch" category="Transport" description="" name="Naptan Street (read-only)" key="naptan:Street"/>
-    <input type="freetext" presence="onTagMatch" category="Transport" description="Delete this when the details have been verified on-the-ground" name="Naptan Verified?" key="naptan:verified"/>
-  </inputSet>
-
-  <inputSet id="buses">
-    <input type="freetext" presence="always" category="Transport" name="Stop Name" key="name" description="The name of the bus stop"/>
-    <input type="freetext" presence="always" category="Transport" name="Local Ref" key="local_ref" description="The local reference of the stop, usually one or two letters above the main flag, used at bus interchanges, e.g. L, BX"/>
-    <inputSet ref="naptan"/>
-  </inputSet>
-
-  <inputSet id="bus-route">
-    <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
-      <match k="type" v="route"/>
-      <match k="route" v="bus"/>
-      <icon image="features/route__bus.png">
-        <font size="12pt">${operator} <b>${ref}</b></font>
-      </icon>
-    </input>
-  </inputSet>
-
-  <inputSet id="tram-route">
-    <input type="route" name="Tram Route" description="Tram route" category="Transport" priority="low" presence="onTagMatch">
-      <match k="type" v="route"/>
-      <match k="route" v="tram"/>
-      <icon image="features/transport__tram.png">
-        <font size="12pt">${operator} <b>${ref}</b></font>
-      </icon>
-    </input>
-  </inputSet>
-
-  <inputSet id="train-route">
-    <input type="route" name="Train Route" description="Train route" category="Transport" priority="low" presence="onTagMatch">
-      <match k="type" v="route"/>
-      <match k="route" v="train"/>
-      <icon image="features/transport__railway.png">
-        <font size="12pt">${name|operator} <b>(${ref})</b></font>
-      </icon>
-    </input>
-  </inputSet>
-
-  <inputSet id="cycle">
-    <inputSet ref="bicycle-permission"/>
-    <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">
-      <match k="type" v="route"/>
-      <match k="route" v="bicycle"/>
-      <match k="network" v="ncn"/>
-      <icon image="features/route__ncn.png" background="#ff6f7a" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-    <input type="route" name="Regional Cycle Routes" description="A signposted route in a Regional Cycle Network, or nearest equivalent." category="Cycle" priority="low">
-      <match k="type" v="route"/>
-      <match k="route" v="bicycle"/>
-      <match k="network" v="rcn"/>
-      <icon image="features/route__rcn.png" background="#6ff7ff" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-    <input type="route" name="Local Cycle Routes" description="A signposted route in a Local Cycle Network, or nearest equivalent." category="Cycle" priority="lowest">
-      <match k="type" v="route"/>
-      <match k="route" v="bicycle"/>
-      <match k="network" v="lcn"/>
-      <icon image="features/route__lcn.png" background="#7d6fff" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-    <input type="route" name="Mountain bike route" description="A signposted route for mountain biking." category="Cycle" priority="lowest">
-      <match k="type" v="route"/>
-      <match k="route" v="mtb"/>
-      <icon image="features/route__mtb.png" background="#9f4404" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-  </inputSet>
-
-  <inputSet id="bicycle-permission">
-    <input type="choice"
-           name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
-           key="bicycle">
-      <choice value="yes" text="Allowed"/>
-      <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/>
-      <choice value="private" text="Private"/>
-      <choice value="dismount" text="Cyclists dismount" description="Signage states that cyclists should dismount and push their bike for the selected path or road."/>
-      <choice value="designated" text="Designated"/>
-      <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
-    </input>
-  </inputSet>
-
-  <inputSet id="bicycle-lane">
-    <input type="choice"
-        name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
-        key="cycleway" layout="horizontal">
-      <choice value="no" text="No bike lanes"/>
-      <choice value="lane" text="On-road bike lane" description="Separated by painted line on the road from cars"/>
-      <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/>
-      <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
-      <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
-      <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>
-      <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
-    </input>
-  </inputSet>
-
-  <inputSet id="ldp">
-    <input type="route" name="National Walking Route" description="National walking route" category="Walk" priority="normal">
-      <match k="type" v="route"/>
-      <match k="route" v="hiking|foot"/>
-      <match k="network" v="nwn"/>
-      <icon image="features/route__nwn.png" background="red" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-    <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walk" priority="low">
-      <match k="type" v="route"/>
-      <match k="route" v="hiking|foot"/>
-      <match k="network" v="rwn"/>
-      <icon image="features/route__rwn.png" background="cyan" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-    <input type="route" name="Local Walking Route" description="Local walking route" category="Walk" priority="lowest">
-      <match k="type" v="route"/>
-      <match k="route" v="hiking|foot"/>
-      <match k="network" v="lwn"/>
-      <icon image="features/route__lwn.png" background="blue" foreground="white">
-        <font size="14pt"><b>${ref}</b></font><br/>
-        <font size="12pt">${name}</font>
-      </icon>
-    </input>
-  </inputSet>
-
-  <inputSet id="route">
-    <inputSet ref="names"/>
-    <inputSet ref="roadRefs"/>
-  </inputSet>
-
-  <inputSet id="waterways">
-    <inputSet ref="simpleName"/>
-    <input type="freetext" presence="always" name="Width" category="Details" key="width" description="The width in metres"/>
-    <inputSet ref="boatPermissions"/>
-  </inputSet>
-<!-- Would be good to have a dedicated 'access' type of input -->
-  <!-- all the description fields are identical at the moment for ease of maintenance, should be tailored in future. -->
-  <inputSet id="boatPermissions">
-    <input type="choice" name="Boat permission" category="Restrictions" key="boat" description="Are boats allowed to use this waterway?">
-      <choice value="yes" text="Allowed" description="General right of way."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
-      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
-      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
-    </input>
-  </inputSet>
-
-  <inputSet id="permissions">
-    <input type="choice" name="General access" category="Restrictions" key="access" description="Is there a general right of access, regardless of mode of transport?">
-      <choice value="yes" text="Allowed" description="General right of way."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
-      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
-      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
-    </input>
-
-    <input type="choice" name="Motor vehicles" category="Restrictions" key="motor_vehicle" description="Are cars and other private vehicles allowed?">
-      <choice value="yes" text="Allowed" description="General right of way."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
-      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
-      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
-    </input>
-
-    <inputSet ref="hores-permission" />
-
-  </inputSet>
-
-  <inputSet id="horse-permission">
-    <input type="choice" name="Horses" category="Restrictions" key="horse" description="Are horses allowed?">
-      <choice value="yes" text="Allowed" description="General right of way."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
-      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
-      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
-    </input>
-  </inputSet>
-
-  <inputSet id="places">
-    <input type="choice" name="Type of Place" presence="always" key="place">
-      <choice value="locality" text="Locality"/>
-      <choice value="hamlet" text="Hamlet"/>
-      <choice value="village" text="Village"/>
-      <choice value="suburb" text="Suburb"/>
-      <choice value="town" text="Town"/>
-      <choice value="city" text="City"/>
-      <choice value="county" text="County"/>
-      <choice value="region" text="Region"/>
-      <choice value="state" text="State"/>
-      <choice value="country" text="Country"/>
-      <choice value="continent" text="Continent"/>
-      <choice value="island" text="Island"/>
-      <choice value="islet" text="Islet"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="isBuilding">
-    <input type="choice" presence="withCategory" category="Details" name="Building type, if it is one" key="building">
-      <choice value="yes" text="Generic building"/>
-      <choice value="residential" text="Generic residential"/>
-      <choice value="apartments" text="Big apartments house"/>
-      <choice value="terrace" text="Terraced house"/>
-      <choice value="house" text="Family house"/>
-      <choice value="hut" text="Small hut"/>
-      <choice value="garage" text="A garage"/>
-      <choice value="garages" text="Block of garages"/>
-      <choice value="office" text="Office building"/>
-      <choice value="public" text="Public building"/>
-      <choice value="industrial" text="Generic industrial"/>
-      <choice value="manufacture" text="Manufacture"/>
-      <choice value="warehouse" text="Warehouse"/>
-      <choice value="hangar" text="Hangar"/>
-      <choice value="storage_tank" text="Fluids storage tank"/>
-      <choice value="retail" text="Retail"/>
-      <choice value="supermarket" text="Supermarket"/>
-      <choice value="train_station" text="Train station"/>
-      <choice value="church" text="Church"/>
-      <choice value="school" text="School"/>
-      <choice value="bunker" text="Military bunker"/>
-      <choice value="collapsed" text="Collapsed building"/>
-      <choice value="roof" text="Just a roof"/>
-      <help>http://wiki.openstreetmap.org/wiki/Key:building</help>
-    </input>
-  </inputSet>
-
-  <inputSet id="powerCables">
-    <input type="choice" name="Cables" key="cables" presence="always" category="Details">
-      <choice value="2" text="2"/>
-      <choice value="3" text="3"/>
-      <choice value="4" text="4"/>
-      <choice value="6" text="6"/>
-      <choice value="8" text="8"/>
-      <choice value="10" text="10"/>
-      <choice value="12" text="12"/>
-    </input>
-    <input type="choice" name="Voltage" key="voltage" presence="always" category="Details">
-      <!-- choices based on http://osmdoc.com/en/tag/voltage/#values-->
-      <choice value="400" text="400 V"/>
-      <choice value="600" text="600 V"/>
-      <choice value="750" text="750 V"/>
-      <choice value="1500" text="1500 V"/>
-      <choice value="3000" text="3000 V"/>
-      <choice value="15000" text="15 kV"/>
-      <choice value="20000" text="20 kV"/>
-      <choice value="35000" text="35 kV"/>
-      <choice value="110000" text="110 kV"/>
-      <choice value="132000" text="132 kV"/>
-      <choice value="138000" text="138 kV"/>
-      <choice value="220000" text="220 kV"/>
-      <choice value="380000" text="380 kV"/>
-      <choice value="500000" text="500 kV"/>
-    </input>
-  </inputSet>
-
-  <inputSet id="pitchSport">
-    <input name="Sport" presence="always" category="Details" key="sport" type="choice" description="The sport that is predominantly played here.">
-      <choice value="9pin" text="9 pin bowling"/>
-      <choice value="10pin" text="10 pin bowling"/>
-      <choice value="american_football" text="American football"/>
-      <choice value="archery" text="Archery"/>
-      <choice value="athletics" text="Athletics"/>
-      <choice value="australian_football" text="Australian Rules Football"/>
-      <choice value="baseball" text="Baseball"/>
-      <choice value="basketball" text="Basketball"/>
-      <choice value="beachvolleyball" text="Beach volleyball"/>
-      <choice value="boules" text="Boules/petanque/bocci"/>
-      <choice value="bowls" text="Lawn bowls"/>
-      <choice value="canadian_football" text="Canadian football"/>
-      <choice value="chess" text="Chess"/>
-      <choice value="cricket" text="Cricket"/>
-      <choice value="cricket_nets" text="Cricket nets"/>
-      <choice value="croquet" text="Croquet"/>
-      <choice value="equestrian" text="Equestrian"/>
-      <choice value="gaelic_football" text="Gaelic football"/>
-      <choice value="gymnastics" text="Gymnastics"/>
-      <choice value="team_handball" text="(Team) handball"/>
-      <choice value="hockey" text="(Field) hockey"/>
-      <choice value="korfball" text="Korball"/>
-      <choice value="pelota" text="Pelota"/>
-      <choice value="rugby_league" text="Rugby league"/>
-      <choice value="rugby_union" text="Rugby union"/>
-      <choice value="shooting" text="Shooting"/>
-      <choice value="skating" text="Ice skating"/>
-      <choice value="skateboard" text="Skateboarding"/>
-      <choice value="soccer" text="Soccer/football"/>
-      <choice value="swimming" text="Swimming"/>
-      <choice value="table_tennis" text="Table tennis"/>
-      <choice value="tennis" text="Tennis"/>
-      <choice value="volleyball" text="Volleyball"/>
-    </input>
-  </inputSet>
-  
-  <inputSet id="wheelchair-basic">
-    <input type="choice" name="Wheelchair" key="wheelchair" presence="onTagMatch" category="Details">
-      <choice value="yes" text="Yes: ramps/elevators/etc" />
-      <choice value="no" text="No: inaccessible to wheelchairs" />
-      <choice value="limited" text="Limited accessibility" />
-    </input>
-  </inputSet>      
-
-<!-- Features -->
-
-  <include file="map_features/roads.xml" />     <!-- includes traffic calming, roundabouts, race track -->
-  <include file="map_features/paths.xml" />     <!-- includes steps, highway=pedestrian, bike/hike routes -->
-  <include file="map_features/water.xml" />     <!-- includes coastline -->
-  <include file="map_features/transport.xml" /> <!-- includes rail, trams, bus, airports, car rental, bike parking... -->
-  <include file="map_features/power.xml" />     <!-- includes power lines, pylons, stations -->
-  <include file="map_features/places.xml" />    <!-- includes boundaries (inc. NP) -->
-  <include file="map_features/tourism.xml" />   <!-- includes accommodation -->
-  <include file="map_features/barriers.xml" /> 
-  <include file="map_features/shopping.xml" />  <!-- no clear distinction between this, amenities and buildings -->
-  <include file="map_features/amenities.xml" /> <!-- includes cafe, bar... --> 
-  <include file="map_features/landuse.xml" />   <!-- includes outdoor leisure/sporting stuff, agriculture, natural. --> 
-  <include file="map_features/man_made.xml" />  
-  <include file="map_features/buildings.xml" /> <!-- a bit of a dumping ground, includes sports centre, shopping centre, hospital... --> 
-
-
-  
-  <!-- Relations -->
-  <feature name="Multipolygon">
-    <category>advanced</category>
-    <relation/>
-    <tag k="type" v="multipolygon"/>
-    <inputSet ref="common"/>
-  </feature>
- 
-</mapFeatures>
diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
deleted file mode 100644
index 318ea6156..000000000
--- a/public/potlatch2/map_features/amenities.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<featureGroup>
-  <!-- =========== Amenity ============ -->
-
-  <feature name="Fire station">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_firestation2.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>
-    <point/>
-    <tag k="amenity" v="fire_station"/>
-    <inputSet ref="simpleName" />
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Police Station">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_police2.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="police"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Library">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_library.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="library"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hospital">
-    <category>amenity</category>
-    <icon image="features/pois/health_hospital.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="hospital"/>
-    <inputSet ref="simpleName"/>
-    <input type="choice" presence="always" category="Details" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Veterinarian">
-    <category>amenity</category>
-    <icon image="features/pois/health_veterinary.n.8E7409.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dveterinary</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="veterinary"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Place of Worship">
-    <category>amenity</category>
-    <icon image="features/pois/place_of_worship_unknown.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>
-    <point/>
-    <tag k="amenity" v="place_of_worship"/>
-    <inputSet ref="simpleName" />
-    <input type="choice" presence="always" category="Details" name="Religion" key="religion" description="The religion worshipped here.">
-      <choice value="christian" text="Christianity (church)"/>
-      <choice value="jewish" text="Judaism (synagogue)"/>
-      <choice value="muslim" text="Islam (mosque)"/>
-      <choice value="hindu" text="Hinduism (temple)"/>
-      <choice value="buddhist" text="Buddhism (temple)"/>
-      <choice value="sikh" text="Sikhism (gurdwara)"/>
-      <choice value="shinto" text="Shinto (shrine)"/>
-    </input>
-
-    <input type="freetext" presence="always" category="Details" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="ATM">
-    <category>amenity</category>
-    <icon image="features/pois/money_atm.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Atm</help>
-    <point/>
-    <tag k="amenity" v="atm"/>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
-    <input type="freetext" presence="always" category="Details" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bank">
-    <category>amenity</category>
-    <icon image="features/pois/money_bank2.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>
-    <point/>
-    <tag k="amenity" v="bank"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <input type="choice" presence="always" category="Details" name="Public ATM available" key="atm" description="Is there a public ATM available?">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Recycling">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_recycling.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="recycling"/>
-    <inputSet ref="simpleName"/>
-    <input type="choice" presence="always" category="Details" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">
-      <choice value="container" text="Container"/>
-      <choice value="centre" text="Recycling centre"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Books" key="recycling:books" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Green waste" key="recycling:green_waste" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Newspaper" key="recycling:newspaper" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Paper" key="recycling:paper" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Plastic" key="recycling:plastic" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Wood" key="recycling:wood" description="" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="School">
-    <category>amenity</category>
-    <icon image="features/pois/education_school.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>
-    <point/>
-    <tag k="amenity" v="school"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Kindergarten">
-    <category>amenity</category>
-    <category>buildings</category>
-    <icon image="features/pois/education_nursery3.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help>
-    <point/>
-    <tag k="amenity" v="kindergarten"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Town hall">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_town_hall.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help>
-    <point/>
-    <tag k="amenity" v="townhall"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Post Box">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_post_box.n.24.png">
-      ${ref}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
-    <point/>
-    <tag k="amenity" v="post_box"/>
-    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post box"/>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Post Office">
-    <category>amenity</category>
-    <category>buildings</category>
-    <icon image="features/pois/amenity_post_office.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="post_office"/>
-    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post office"/>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <inputSet ref="common"/>
-    <inputSet ref="simpleName"/>
-  </feature>
-
-  <feature name="Trash/rubbish bin">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_waste_bin.n.24.png">
-      ${ref}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help>
-    <point/>
-    <tag k="amenity" v="waste_basket"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Toilets">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_toilets.n.24.png">
-      ${ref}
-    </icon>
-    <point/>
-    <tag k="amenity" v="toilets"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Water fountain">
-    <category>amenity</category>
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_drinkingtap.n.24.png">
-      ${ref}
-    </icon>
-    <point/>
-    <tag k="amenity" v="drinking_water"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Shelter">
-    <category>amenity</category>
-    <icon image="features/pois/accommodation_shelter2.n.24.png">
-      ${name}
-    </icon>    
-    <point/>
-    <area/>
-    <tag k="amenity" v="shelter"/>
-    <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
-      <choice value="picnic_shelter" text="Picnic shelter"/>
-      <choice value="public_transport" text="Public transport"/>
-      <choice value="weather_shelter" text="Weather shelter"/>
-      <choice value="wildlife_hide" text="Wildlife hide"/>
-    </input>
-    <inputSet ref="names"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Barbecue">
-    <category>amenity</category>
-    <icon image="features/pois/tourist_picnic.n.24.png"/>
-    <!-- specific icon needed -->
-    <point/>
-    <tag k="amenity" v="bbq"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Hunting stand">
-    <category>sport</category>
-    <icon image="features/pois/sport_shooting.n.24.png"/>
-    <point/>
-    <tag k="amenity" v="hunting_stand"/>
-    <inputSet ref="common"/>
-    <inputSet ref="names"/>
-  </feature>
-
-
-  <feature name="Park bench">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_bench.n.24.png" />
-    <point/>
-    <tag k="amenity" v="bench"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Public telephone">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_telephone.n.24.png" />
-    <point/>
-    <tag k="amenity" v="telephone"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Emergency phone">
-    <category>amenity</category>
-    <icon image="features/pois/emergency-telephone-24.png" />
-    <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice -->
-    <point/>
-    <tag k="amenity" v="emergency_phone"/>
-    <inputSet ref="common"/>
-    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of emergency phone."/>    
-  </feature>
-
-
-  <feature name="Swimming pool">
-    <category>amenity</category>
-    <category>sport</category>
-    <icon image="features/pois/sport_swimming_outdoor.n.24.png">
-      ${name}
-    </icon>
-    <point/>
-    <area/>
-    <tag k="amenity" v="swimming_pool"/>
-    <tag k="sport" v="swimming"/>
-    <inputSet ref="simpleName"/>    
-    <inputSet ref="common"/>
-    <inputSet ref="permissions"/>
-    <input type="choice" presence="always" name="Indoor" key="covered" description="Indoor or outdoor?">
-      <choice value="yes" text="Indoor"/>
-      <choice value="no" text="Outdoor"/>
-    </input>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The organisation that runs the swimming pool." />    
-
-  </feature>
-
-  <feature name="Fountain">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_fountain2.n.24.png">
-    ${name}
-    </icon>
-    <point/>
-    <tag k="amenity" v="fountain"/>
-    <inputSet ref="common"/>
-    <inputSet ref="simpleName"/>
-  </feature>
-
-  <feature name="Vending machine">
-    <category>amenity</category>
-    <category>foodanddrink</category>
-    <icon image="features/pois/shopping_vending_machine.n.24.png">A vending machine.</icon>
-
-    <point/>
-    <tag k="amenity" v="vending_machine"/>
-    <inputSet ref="common"/>
-    <inputSet ref="simpleName"/>
-    <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
-    <inputSet ref="simpleOperator" />
-  </feature>
-
-  <!-- ========= Entertainment ========= -->
-
-  <feature name="Pub">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_pub.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>
-    <point/>
-    <tag k="amenity" v="pub"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="wifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bar">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_bar.n.24.png">
-      ${name}
-    </icon>
-    <point/>
-    <tag k="amenity" v="bar"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="wifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Restaurant">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_restaurant.n.24.png">
-      ${name}
-    </icon>
-    <point/>
-    <tag k="amenity" v="restaurant"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="cuisine"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cafe">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_cafe.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
-    <point/>
-    <tag k="amenity" v="cafe"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="cuisine"/>
-    <inputSet ref="wifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fast Food">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_fastfood.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>
-    <point/>
-    <tag k="amenity" v="fast_food"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="cuisine"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/barriers.xml b/public/potlatch2/map_features/barriers.xml
deleted file mode 100644
index 916de11eb..000000000
--- a/public/potlatch2/map_features/barriers.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<featureGroup>
-  <feature name="Wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
-
-    <line/>
-    <tag k="barrier" v="wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Ditch">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
-
-    <line/>
-    <tag k="barrier" v="ditch"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Retaining wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
-
-    <line/>
-    <tag k="barrier" v="retaining_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="City wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
-
-    <line/>
-    <tag k="barrier" v="city_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fence">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
-
-    <line/>
-    <tag k="barrier" v="fence"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hedge">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
-
-    <line/>
-    <tag k="barrier" v="hedge"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Bollard">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_bollard.n.24.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
-
-    <point/>
-    <tag k="barrier" v="bollard"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Gate">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_gate.n.24.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
-
-    <point/>
-    <tag k="barrier" v="gate"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Lift Gate">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_lift_gate.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help>
-    <point/>
-    <tag k="barrier" v="lift_gate"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Kissing Gate">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_kissing_gate.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help>
-    <point/>
-    <tag k="barrier" v="kissing_gate"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Cycle Barrier">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_cycle_barrier.24.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
-
-    <point/>
-    <tag k="barrier" v="cycle_barrier"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Big Concrete Blocks">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_blocks.24.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
-
-    <point/>
-    <tag k="barrier" v="block"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cattle Grid">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_cattle_grid.24.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
-
-    <point/>
-    <tag k="barrier" v="cattle_grid"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Toll Booth">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_toll_booth.n.24.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
-
-    <point/>
-    <tag k="barrier" v="toll_booth"/>
-    <inputSet ref="fee"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Stile">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_stile.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help>
-    <point/>
-    <tag k="barrier" v="stile"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Wire fence">
-    <!-- no idea, but taginfo says 2700 uses -->
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-   
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help>
-
-    <line/>
-    <tag k="barrier" v="wire_fence"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
deleted file mode 100644
index e82502689..000000000
--- a/public/potlatch2/map_features/buildings.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<featureGroup>
-  <feature name="School">
-    <category>buildings</category>
-    <icon image="features/pois/education_school.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="school"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="College">
-    <category>buildings</category>
-    <icon image="features/pois/education_university.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="college"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="University">
-    <category>buildings</category>
-    <icon image="features/pois/education_university.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="university"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Supermarket">
-    <category>buildings</category>
-    <icon image="features/pois/shopping_supermarket.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="shop" v="supermarket"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Place of worship">
-    <category>buildings</category>
-    <icon image="icons/place_of_worship.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="place_of_worship"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <!-- sorted in reverse order of popularity in taginfo. -->
-    <input type="choice" category="Details" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always">
-      <choice value="christian" text="Christianity (church)"/>
-      <choice value="muslim" text="Islam (mosque)"/>
-      <choice value="buddhist" text="Buddhist (temple)"/>
-      <choice value="jewish" text="Judaism (synagogue)"/>
-      <choice value="hindu" text="Hindu (temple)"/>
-      <choice value="sikh" text="Sikh (gurdwara)"/>
-      <choice value="spiritualist" text="Spiritualism"/>
-      <choice value="unitarian" text="Unitarianism"/>
-      <choice value="taoist" text="Taoism"/>
-      <choice value="multifaith" text="Multi-faith"/>
-      <choice value="scientologist" text="Scientology"/>
-      <choice value="bahai" text="Bahai"/>
-    </input>
-    <!-- sorted in reverse order of popularity in taginfo. -->
-    <input type="choice" category="Details" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always">
-      <choice value="catholic" text="Catholic"/>
-      <choice value="baptist" text="Baptist"/>
-      <choice value="methodist" text="Methodist"/>
-      <choice value="lutheran" text="Lutheran"/>
-      <choice value="protestant" text="Prostant"/>
-      <choice value="orthodox" text="Orthodox"/>
-      <choice value="presbyterian" text="Presbyterian"/>
-      <choice value="anglican" text="Anglican"/>
-      <choice value="roman_catholic" text="Roman Catholic"/>
-      <choice value="evangelical" text="Evangelical"/>
-      <choice value="pentecostal" text="Pentecostal"/>
-      <choice value="mormon" text="Mormon"/>
-      <choice value="sunni" text="Sunni"/>
-      <choice value="jehovahs_witness" text="Jehovah's Witness"/>
-      <!-- duplicate of Anglican? -->
-      <choice value="church_of_england" text="Church of England"/>
-      <choice value="greek_orthodox" text="Greek Orthodox"/>
-      <choice value="new_apostolic" text="New Apostolic"/>
-      <choice value="episcopal" text="Episcopal"/>
-      <choice value="russian_orthodox" text="Russian Orthodox"/>
-      <choice value="adventist" text="Adventist"/>
-      <choice value="seventh_day_adventist" text="Seventh Day Adventist"/>
-      <choice value="united_reformed" text="United Reformed"/>
-      <choice value="reformed" text="Reformed"/>
-      <choice value="iglesia_ni_cristo" text="Iglesia Ni Cristo"/>
-      <choice value="uniting" text="Uniting"/>
-      <choice value="salvation_army" text="Salvation Army"/>
-      <choice value="church_of_scotland" text="Church of Scotland"/>
-      <choice value="quaker" text="Quaker"/>
-      <choice value="scientist" text="Scientist"/>
-      <choice value="shia" text="Shia"/>
-      <choice value="congregational" text="Congregational"/>
-      <choice value="assembly_of_god" text="Assembly of God"/>
-      <choice value="united" text="United"/>
-      <choice value="mennonite" text="Mennonite"/>
-      <choice value="nazarene" text="Nazarene"/>
-      <!-- duplicate of Mormon? -->
-      <choice value="latter_day_saints" text="Latter Day Saints"/>
-      <choice value="dutch_reformed" text="Dutch Reformed"/>
-      <choice value="tibetan" text="Tibetan"/>
-      <choice value="shingon" text="Shingon"/>
-      <choice value="georgian_orthodox" text="Georgian Orthodox"/>
-      <choice value="unitarian" text="Unitarian"/>
-      <choice value="brethren" text="Brethren"/>
-      <choice value="armenian_apostolic" text="Armenian Apostolic"/>
-      <choice value="maronite" text="Maronite"/>
-    </input>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Public building">
-    <category>buildings</category>
-    <icon image="features/pois/building_generic.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="public_building"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hospital">
-    <category>buildings</category>
-    <icon image="features/pois/health_hospital.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="hospital"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Museum">
-    <category>buildings</category>
-    <icon image="features/pois/tourist_museum.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="museum"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Shopping centre">
-    <category>buildings</category>
-    <category>shopping</category>
-    <node/>
-    <area/>
-    <tag k="shop" v="mall"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Zoo">
-    <category>buildings</category>
-    <icon image="features/pois/tourist_zoo.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="zoo"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Stadium">
-    <category>buildings</category>
-    <icon image="features/pois/sport_stadium.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="leisure" v="stadium"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- Generic building. Should be last in the entire xml chain -->
-  <!-- When user changes feature to some amenity, building tag is cleared. This should not be. -->
-  <feature name="Building">
-    <category>buildings</category>
-    <icon image="features/pois/building_generic.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <point/>
-    <tag k="building" v="yes" vmatch="*"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
-  
\ No newline at end of file
diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
deleted file mode 100644
index e2e51d845..000000000
--- a/public/potlatch2/map_features/landuse.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<!-- This is a bit of a dumping ground for real landuse=*, but also outdoor natural/leisure/agriculture type keys. -->
-<featureGroup>
-  <feature name="Industrial Area">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="industrial"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Offices">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="commercial"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Residential Area">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="residential"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Retail Area">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="retail"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Construction Site">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="construction"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Marketplace">
-    <category>shopping</category>
-    <point />
-    <area/>
-    <icon image="features/pois/shopping_marketplace.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="amenity" v="marketplace"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cemetery">
-    <category>landuse</category>
-    <point />
-    <area/>
-    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="cemetery"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Graveyard">
-    <category>landuse</category>
-    <point />
-    <area/>
-    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="amenity" v="grave_yard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Quarry">
-    <category>landuse</category>
-    <icon image="features/pois/poi_mine.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="quarry"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Military">
-    <category>landuse</category>
-    <icon image="features/pois/poi_military_bunker.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="military"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Conservation">
-    <category>natural</category>
-    <icon image="icons/natural_blank.png"/>
-    <area/>
-    <tag k="landuse" v="conservation"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Beach">
-    <category>natural</category>
-    <icon image="features/natural__beach.png"/>
-    <area/>
-    <tag k="natural" v="beach"/>
-    <input type="choice" presence="always" category="Details" name="Beach surface" key="surface" description="What material is the ground mostly?">
-      <choice value="sand" text="Sand"/>
-      <choice value="pebbles" text="Pebbles"/>
-      <choice value="stone" text="Pebbles"/>
-      <choice value="rocky" text="Rocky"/>
-    </input>
-    <input type="choice" presence="always" category="Details" name="Access" key="access" description="Accessible to the public?">
-      <choice value="yes" text="Public access"/>
-      <choice value="permissive" text="Privately owned, but publicly accessible"/>
-      <choice value="private" text="Private access only"/>
-    </input>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="Operator" description="Organisation that manages or owns the beach.">
-    </input>
-    
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-
-  <feature name="Playground">
-    <category>sport</category>
-    <area/>
-    <point/>
-    <icon image="features/pois/amenity_playground.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="playground"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Golf course">
-    <category>sport</category>
-    <area/>
-    <icon  image="features/pois/sport_golf.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="golf_course"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Recreation ground">
-    <category>sport</category>    
-    <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="recreation_ground"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Sports pitch">
-    <category>sport</category>
-    <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="pitch"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="pitchSport"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Sports track">
-    <category>sport</category>
-    <area/>
-    <line/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name}</b>
-      <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>
-    </icon>
-    <tag k="leisure" v="track"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Sports centre">
-    <category>sport</category>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <point/>
-    <tag k="leisure" v="sports_centre"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="pitchSport"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- **************** Agriculture *************** -->
-  <feature name="Farm">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="farm"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Farmyard">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="farmyard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Farmland">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="farmland"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Field">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="meadow"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Orchard">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="orchard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Vineyard">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="vineyard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-<!-- ************************************************************************
-       Natural
-       ************************************************************************ -->
-
-  <feature name="Park">
-    <category>natural</category>
-    <category>sport</category>
-    <icon image="icons/natural_blank.png">
-      <b>${name}</b>
-      <br/>
-    </icon>
-
-    <area/>
-    <tag k="leisure" v="park"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Forest">
-    <category>natural</category>
-    <icon image="features/pois/landuse_coniferous.n.24.png"/>
-
-    <area/>
-    <tag k="landuse" v="forest"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Meadow">
-    <category>natural</category>
-    <icon image="icons/natural_blank.png"/>
-
-    <area/>
-    <tag k="landuse" v="meadow"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
diff --git a/public/potlatch2/map_features/man_made.xml b/public/potlatch2/map_features/man_made.xml
deleted file mode 100644
index 52db9362c..000000000
--- a/public/potlatch2/map_features/man_made.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<featureGroup>
-  <feature name="Tower/mast">
-    <category>manmade</category>
-    <icon image="features/manmade_tower.png"/>
-    <point/>
-    <tag k="man_made" v="tower" vmatch="tower|water_tower|lighthouse|chimney|mast|communications_tower|flagpole|antenna|pole|cross"/>
-    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
-      <choice value="tower" text="Tower"/>
-      <choice value="water_tower" text="Water tower"/>
-      <choice value="lookout_tower" text="Lookout tower"/>
-      <choice value="lighthouse" text="Lighthouse"/>
-      <choice value="chimney" text="Chimney"/>
-      <choice value="mast" text="Mast"/>
-      <choice value="flagpole" text="Flagpole"/>
-      <choice value="pole" text="Pole"/>
-      <choice value="cross" text="Cross"/>
-      <choice value="communications_tower" text="Comm. tower"/>
-      <choice value="communications_transponder" text="Comm. transponder"/>
-      <choice value="antenna" text="Antenna"/>
-    </input>
-    <inputSet ref="nameAndRef" />
-    <inputSet ref="common"/>
-  </feature>
-  
-  <feature name="Navigation mark">
-    <category>manmade</category>
-    <icon image="features/manmade_lighthouse.png"/>
-    <point/>
-    <tag k="man_made" v="survey_point" vmatch="survey_point|lighthouse|beacon|cairn|buoy"/>
-    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
-      <choice value="survey_point" text="Trig point"/>
-      <choice value="lighthouse" text="Lighthouse"/>
-      <choice value="beacon" text="Beacon"/>
-      <choice value="cairn" text="Cairn"/>
-      <choice value="buoy" text="Buoy"/>
-    </input>
-    <inputSet ref="nameAndRef" />
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Silo/tank">
-    <category>manmade</category>
-    <icon image="features/manmade_silo.png"/>
-    <point/>
-    <area/>
-    <tag k="man_made" v="silo" vmatch="silo|storage_tank|tank|oil_tank|water_tank|fuel_storage_tank|reservoir|reservoir_covered|gasometer|bladder"/>
-    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
-      <choice value="silo" text="Silo"/>
-      <choice value="storage_tank" text="Storage tank"/>
-      <choice value="tank" text="Tank"/>
-      <choice value="oil_tank" text="Oil tank"/>
-      <choice value="water_tank" text="Water tank"/>
-      <choice value="water_tower" text="Water tower"/> <!-- supported here but grouped under "tower/mast" -->
-      <choice value="fuel_storage_tank" text="Fuel storage tank"/>
-      <choice value="reservoir" text="Reservoir"/>
-      <choice value="reservoir_covered" text="Covered reservoir"/>
-      <choice value="gasometer" text="Gasometer"/>
-      <choice value="bladder" text="Bladder"/>
-    </input>
-    <inputSet ref="nameAndRef" />
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>  
-
diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml
deleted file mode 100644
index b737f1637..000000000
--- a/public/potlatch2/map_features/paths.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<featureGroup>
-  <feature name="Footpath">
-    <category>paths</category>
-    <icon image="features/paths__footway.png">
-      ${name} <i>${ref}</i>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>
-    <line/>
-    <tag k="highway" v="footway"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Cycle path">
-    <category>paths</category>
-    <icon image="features/paths__bike.png">
-      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>
-    <line/>
-    <tag k="highway" v="cycleway"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-    <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low">
-      <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." />
-      <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." />
-    </input>
-  </feature>
-
-  <feature name="Pedestrian street">
-    <category>paths</category>
-    <icon image="features/paths__pedestrian.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <tag k="highway" v="pedestrian"/>
-    <!-- pedestrian roads can be lines or areas, with different tags -->
-    <!-- TODO - implement this! -->
-    <line>
-      <tag k="highway" v="pedestrian"/>
-    </line>
-    <area>
-      <tag k="highway" v="pedestrian"/>
-      <tag k="area" v="yes"/>
-    </area>
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Bridleway">
-    <category>paths</category>
-    <icon image="features/paths__bridleway.png">
-    </icon>
-
-    <line/>
-    <tag k="highway" v="bridleway"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Steps">
-    <category>paths</category>
-    <icon image="features/paths__steps.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>
-
-    <line/>
-    <tag k="highway" v="steps"/>
-    <inputSet ref="path"/>
-    <input type="freetext" presence="always" category="Details" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-  <feature name="Generic path">
-    <category>paths</category>
-    <icon image="features/paths__unofficial.png">
-      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help>
-
-    <line/>
-    <tag k="highway" v="path"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  
-  <!-- Bicycle routes -->
-  <feature name="National Cycle Network">
-    <category>paths</category>
-    <icon image="features/route__ncn.png" background="red" foreground="white">
-      <font size="14pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="bicycle"/>
-    <tag k="network" v="ncn"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Regional Cycle Network">
-    <category>paths</category>
-    <icon image="features/route__rcn.png" background="cyan" foreground="white">
-      <font size="14pt"><b>${ref}</b></font><br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="bicycle"/>
-    <tag k="network" v="rcn"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Local Cycle Network">
-    <category>paths</category>
-    <icon image="features/route__lcn.png" background="blue" foreground="white">
-      <font size="14pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="bicycle"/>
-    <tag k="network" v="lcn"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Mountain bike route">
-    <category>paths</category>
-    <icon image="features/route__mtb.png" background="#9f4404" foreground="white">
-      <font size="14pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="mtb"/>
-
-    <input type="choice" presence="always" category="Details" name="Route type" key="mtb:type" description="What type of route is it?">
-      <choice value="crosscountry" text="Cross-country"/>
-      <choice value="allmountain" text="All-mountain"/>
-      <choice value="freeride" text="Freeride"/>
-      <choice value="downhill" text="Downhill"/>
-      <choice value="trial" text="Trial"/>
-    </input>
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-  <!-- hiking -->
-  
-  <feature name="Long Distance Path">
-    <category>paths</category>
-    <icon image="features/route__nwn.png" background="green" foreground="white">
-      <font size="14pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="hiking" vmatch="hiking|foot"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-</featureGroup>
diff --git a/public/potlatch2/map_features/places.xml b/public/potlatch2/map_features/places.xml
deleted file mode 100644
index 0beea2377..000000000
--- a/public/potlatch2/map_features/places.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<featureGroup>
-  <feature name="Hamlet">
-    <category>places</category>
-    <icon image="features/pois/poi_place_hamlet.p.24.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="hamlet" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Village">
-    <category>places</category>
-    <icon image="features/pois/poi_place_village.p.24.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="village" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Town">
-    <category>places</category>
-    <icon image="features/pois/poi_place_town.p.24.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="town" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Suburb">
-    <category>places</category>
-    <icon image="features/pois/poi_place_suburb.p.24.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="suburb" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="City">
-    <category>places</category>
-    <icon image="features/pois/poi_place_city.p.24.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="city" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-<!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->
-
-  <feature name="Admin Boundary">
-    <category>places</category>
-    <line/>
-    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
-    <tag k="boundary" v="administrative"/>
-    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="National Park">
-    <category>places</category>
-    <category>natural</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>
-    <tag k="boundary" v="national_park"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Protected Area">
-    <category>places</category>
-    <category>natural</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>
-    <tag k="boundary" v="protected_area"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Town boundary">
-    <category>places</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>
-    <tag k="boundary" v="town"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- boundary=landuse goes here. no idea what it is.-->
-
-  <feature name="Census boundary">
-    <category>places</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>
-    <tag k="boundary" v="census"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- next three are marker, postcode_area, administrative. all seem dubious -->
-  
-  
-  
-</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/power.xml b/public/potlatch2/map_features/power.xml
deleted file mode 100644
index 87ff63f91..000000000
--- a/public/potlatch2/map_features/power.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<featureGroup>
-  <feature name="High-voltage line">
-    <category>power</category>
-    <icon image="features/power_high.png"/>
-    <line/>
-    <tag k="power" v="line"/>
-    <inputSet ref="powerCables"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Low-voltage line">
-    <category>power</category>
-    <icon image="features/power_low.png"/>
-    <line/>
-    <tag k="power" v="minor_line"/>
-    <inputSet ref="powerCables"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="High-voltage pylon">
-    <category>power</category>
-    <icon image="features/pois/power_tower_high2.n.24.png"/>
-    <point/>
-    <tag k="power" v="tower"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Power pole">
-    <category>power</category>
-    <icon image="features/pois/power_tower_low.n.24.png"/>
-    <point/>
-    <tag k="power" v="pole"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Plant (station)">
-    <category>power</category>
-    <icon image="features/pois/power_station.png"/>
-    <area/>
-    <point/>
-    <tag k="power" v="generator"/>
-    <inputSet ref="names"/>
-    <input type="choice" presence="always"  name="Energy source" key="power_source" category="Details">
-      <choice value="coal" text="Coal"/>
-      <choice value="gas" text="Gas"/>
-      <choice value="oil" text="Oil"/>
-      <choice value="fossil" text="Unspecified fossil fuel"/>
-      <choice value="hydro" text="Hydroelectric"/>
-      <choice value="geothermal" text="Geothermal"/>
-      <choice value="nuclear" text="Nuclear"/>
-      <choice value="wind" text="Wind"/>
-      <choice value="photovoltaic" text="Solar PV"/>
-      <choice value="solar_thermal" text="Solar thermal"/>
-      <choice value="biofuel" text="Biofuel"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Substation">
-    <category>power</category>
-    <icon image="features/pois/power_substation.n.24.png"/>"
-    <area/>
-    <point/>
-    <tag k="power" v="station"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Transformer">
-    <category>power</category>
-    <icon image="features/pois/power_transformer.n.24.png"/>
-    <area/>
-    <point/>
-    <tag k="power" v="sub_station"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml
deleted file mode 100644
index b731d6dd2..000000000
--- a/public/potlatch2/map_features/roads.xml
+++ /dev/null
@@ -1,366 +0,0 @@
-<featureGroup>
-  <!-- ************************************************************************
-       Roads
-       ************************************************************************ -->
-
-
-  <feature name="Motorway">
-    <category>roads</category>
-    <icon image="features/highway__motorway.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway</help>
-
-    <line/>
-    <tag k="highway" v="motorway"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Motorway link">
-    <category>roads</category>
-    <icon image="features/highway__motorway_link.png"/>
-    <line/>
-    <tag k="highway" v="motorway_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Trunk road">
-    <category>roads</category>
-    <icon image="features/highway__trunk.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrunk</help>
-
-    <line/>
-    <tag k="highway" v="trunk"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Trunk link">
-    <category>roads</category>
-    <icon image="features/highway__trunk_link.png"/>
-    <line/>
-    <tag k="highway" v="trunk_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Primary road">
-    <category>roads</category>
-    <icon image="features/highway__primary.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary</help>
-
-    <line/>
-    <tag k="highway" v="primary"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Primary link">
-    <category>roads</category>
-    <icon image="features/highway__primary_link.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary_link</help>
-
-    <line/>
-    <tag k="highway" v="primary_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Secondary road">
-    <category>roads</category>
-    <icon image="features/highway__secondary.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary</help>
-
-    <line/>
-    <tag k="highway" v="secondary"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Secondary link">
-    <category>roads</category>
-    <icon image="features/highway__secondary_link.png">
-      <font size="16pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary_link</help>
-
-    <line/>
-    <tag k="highway" v="secondary_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Tertiary road">
-    <category>roads</category>
-    <icon image="features/highway__tertiary.png">
-      <font size="14pt"><b>${name}</b></font><br/>
-      <font size="10pt">${ref}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary</help>
-
-    <line/>
-    <tag k="highway" v="tertiary"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Tertiary link">
-    <category>roads</category>
-    <icon image="features/highway__tertiary_link.png">
-      <font size="14pt"><b>${name}</b></font><br/>
-      <font size="10pt">${ref}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary_link</help>
-
-    <line/>
-    <tag k="highway" v="tertiary_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Minor road">
-    <category>roads</category>
-    <icon image="features/highway__unclassified.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help>
-
-    <line/>
-    <tag k="highway" v="unclassified"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Residential road">
-    <category>roads</category>
-    <icon image="features/highway__residential.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-      <br/>
-      <font size="8pt">${postal_code}</font>
-      <br/>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
-
-    <line/>
-    <tag k="highway" v="residential"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Service road">
-    <category>roads</category>
-    <icon image="features/highway__service.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dservice</help>
-    <description>
-      Access roads
-    </description>
-
-    <line/>
-    <tag k="highway" v="service"/>
-
-    <inputSet ref="minorRoad"/>
-    <input type="choice" presence="always" name="Type of service road" key="service" category="">
-      <choice value="alley" text="Alleyway/laneway"/>
-      <choice value="parking_aisle" text="Parking aisle" description="The path that cars drive on through a parking lot."/>
-      <choice value="driveway" text="Driveway"/>
-      <choice value="drive-through" text="Drive-through" description="For drive-through restaurants, bottle shops etc."/>
-      <choice value="emergency_access" text="Emergency access" description="For firefighters and other emergency services."/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Unknown road">
-    <category>roads</category>
-    <icon image="features/highway__unknown.png">
-      <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
-    </icon>
-
-    <line/>
-    <tag k="highway" v="road"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Living Street">
-    <category>roads</category>
-    <icon image="features/highway__living_street.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>
-
-    <line/>
-    <tag k="highway" v="living_street"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Track">
-    <category>roads</category>
-    <icon image="features/highway__track.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-
-    <line/>
-    <tag k="highway" v="track"/>
-
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Raceway/racing track">
-    <category>sport</category>
-    <icon>
-      <font size="10pt">A purpose built track for racing motor vehicles.</font>
-    </icon>
-
-    <line/>
-    <area/>
-    <tag k="highway" v="raceway"/>
-
-    <inputSet ref="simpleName"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-  
-  <feature name="Turning circle">
-    <category>transport</category>
-    <icon image="features/pois/transport_turning_circle.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help>
-    <point draganddrop="no"/>
-    <tag k="highway" v="turning_circle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Mini Roundabout">
-    <category>transport</category>
-    <icon image="features/pois/transport_miniroundabout_anticlockwise.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
-    <point/>
-    <tag k="highway" v="mini_roundabout"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Traffic calming">
-    <category>transport</category>
-    <icon image="features/pois/transport_speedbump.n.24.png"/>
-<!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->
-    <point/>
-    <tag k="traffic_calming" v="yes" vmatch="*"/>
-    <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
-      <choice value="yes" text="Unspecified"/>
-      <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
-      <choice value="hump" text="Speed hump" description="A gentler, longer bump, typically slowing cars to 30 kph or less."/>
-      <choice value="cushion" text="Speed cushion" description="A narrow speed bump allowing emergency vehicles and buses to pass without slowing."/>
-      <choice value="table" text="Speed table" description="A very long speed hump allowing the whole wheelbase to rest on top."/>
-      <choice value="chicane" text="Chicane" description="A set of obstacles causing vehicles to weave through."/>
-      <choice value="rumble_strip" text="Rumble strip" description="A series of very small bumps causing vibration or noise."/>
-      <choice value="choker" text="Choker" description="An artificial narrowing of the road."/>
-    </input>
-
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Pedestrian crossing">
-    <category>transport</category>
-    <icon image="features/pois/transport_zebracrossing.n.24.png"/>
-    <point />
-    <within entity="way" k="highway"/>
-    <tag k="highway" v="crossing"/>
-    <input type="choice" key="crossing" name="Type of crossing" presence="always">
-      <choice value="yes" text="Generic" vmatch="unknown" />
-      <choice value="uncontrolled" text="Uncontrolled (no lights)" />
-      <choice value="traffic_signals" text="Traffic lights" />
-      <choice value="island" text="Traffic island" />
-      <choice value="unmarked" text="Unmarked" />
-      <choice value="no" text="None" />
-    </input>
-    <inputSet ref="common"/>
-    <inputSet ref="bicycle-permission"/>
-    <inputSet ref="horse-permission"/>
-    <input type="checkbox" key="supervised" name="Supervised by crossing guard" category="Details" presence="onTagMatch" />
-    <input type="checkbox" key="segregated" name="Horses, pedestrians etc segregated from each other" category="Details" presence="onTagMatch" />
-    <input type="freetext" key="crossing_ref" name="Crossing category reference"  category="Details" presence="onTagMatch" />
-  </feature>
-
-  <feature name="Turn restriction">
-    <category>advanced</category>
-    <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
-    <relation/>
-    <tag k="type" v="restriction"/>
-    <input type="choice" category="Restrictions" presence="always" name="Type" key="restriction" description="What's the restriction?" layout="horizontal" priority="high">
-      <choice value="no_left_turn"      text="No left turn"/>
-      <choice value="no_right_turn"     text="No right turn"/>
-      <choice value="no_u_turn"         text="No U turns"/>
-      <choice value="no_straight_on"    text="No straight on"/>
-      <choice value="only_left_turn"    text="Left turn only"/>
-      <choice value="only_right_turn"   text="Right turn only"/>
-      <choice value="only_straight_on"  text="Straight on only"/>
-    </input>
-    <input type="choice" category="Restrictions" presence="always" name="Except" key="except" description="Are any vehicles exempt?" layout="horizontal">
-      <choice value="psv"      text="Bus"/>
-      <choice value="bicycle"  text="Bicycle"/>
-      <choice value="motorcar" text="Car"/>
-      <choice value="hgv"      text="HGV"/>
-    </input>
-    <input type="freetext" category="Restrictions" presence="always" name="Start day"  key="day_on"   description="What day of the week does it start?" layout="horizontal" priority="low"/>
-    <input type="freetext" category="Restrictions" presence="always" name="Start time" key="hour_on"  description="What time of day does it start?"     layout="horizontal" priority="low"/>
-    <input type="freetext" category="Restrictions" presence="always" name="End day"    key="day_off"  description="What day of the week does it end?"   layout="horizontal" priority="lowest"/>
-    <input type="freetext" category="Restrictions" presence="always" name="End time"   key="hour_off" description="What time of day does it end?"       layout="horizontal" priority="lowest"/>
-    <inputSet ref="common"/>
-  </feature>
-
-    
-  <!-- Junction nodes (for turn restrictions) -->
-
-  <feature name="Intersection">
-    <point/>
-    <within entity="way" k="highway" minimum="2"/>
-    <inputSet ref="junctionNode"/>
-    <inputSet ref="trafficSignals"/>    
-    <inputSet ref="common"/>
-  </feature>
-  
-  
-</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/shopping.xml b/public/potlatch2/map_features/shopping.xml
deleted file mode 100644
index dc46eaf9e..000000000
--- a/public/potlatch2/map_features/shopping.xml
+++ /dev/null
@@ -1,347 +0,0 @@
-<featureGroup>
-  <feature name="Supermarket">
-    <category>shopping</category>
-    <icon image="features/pois/shopping_supermarket.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
-    <point/>
-    <area/>
-    <tag k="shop" v="supermarket"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Small Convenience Store">
-    <category>shopping</category>
-    <icon image="features/pois/shopping_convenience.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>
-    <point/>
-    <area/>
-    <tag k="shop" v="convenience"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Bakery">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_bakery.n.24.png"/>
-    <tag k="shop" v="bakery"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-
-  <feature name="Alcohol shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_alcohol.n.24.png"/>
-    <tag k="shop" v="alcohol"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Bike shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_bicycle.n.24.png"/>
-    <tag k="shop" v="bicycle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bookshop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_book.n.24.png"/>
-    <tag k="shop" v="books"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Butcher">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_butcher.n.24.png"/>
-    <tag k="shop" v="butcher"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Car sales">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_car.n.24.png"/>
-    <tag k="shop" v="car"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Car repair">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_car_repair.n.24.png"/>
-    <tag k="shop" v="car_repair"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Clothes shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_clothes.n.24.png"/>
-    <tag k="shop" v="clothes"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Confectionery">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_confectionery.n.24.png"/>
-    <tag k="shop" v="confectionery"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="DIY">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_diy.n.24.png"/>
-    <tag k="shop" v="doityourself"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fishmonger">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_fish.n.24.png"/>
-    <tag k="shop" v="fishmonger"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Florist">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_florist.n.24.png"/>
-    <tag k="shop" v="florist"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Garden centre">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_garden_centre.n.24.png"/>
-    <tag k="shop" v="garden_centre"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Gift shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_gift.n.24.png"/>
-    <tag k="shop" v="gift"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Greengrocer">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_greengrocer.n.24.png"/>
-    <tag k="shop" v="greengrocer"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hairdresser">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_hairdresser.n.24.png"/>
-    <tag k="shop" v="hairdresser"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hifi shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_hifi.n.24.png"/>
-    <tag k="shop" v="hifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Jewellery">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_jewelry.n.24.png"/>
-    <tag k="shop" v="jewelry"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Kiosk">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_kiosk.n.24.png"/>
-    <tag k="shop" v="kiosk"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Laundrette">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_laundrette.n.24.png"/>
-    <tag k="shop" v="laundry"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Motorbike shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_motorcycle.n.24.png"/>
-    <tag k="shop" v="motorcycle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Music shop">
-    <category>shopping</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_music.n.24.png"/>
-    <tag k="shop" v="music"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Pharmacy">
-    <category>shopping</category>
-    <icon image="features/pois/health_pharmacy.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="pharmacy"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <input type="checkbox" category="Details" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Toy shop">
-    <category>shopping</category>
-    <icon image="features/pois/shopping_toys.n.24.png" />
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <tag k="shop" v="toys"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
-
-  
\ No newline at end of file
diff --git a/public/potlatch2/map_features/tourism.xml b/public/potlatch2/map_features/tourism.xml
deleted file mode 100644
index 1ad78ae1d..000000000
--- a/public/potlatch2/map_features/tourism.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<featureGroup>
-<!-- ========= Accommodation ========= -->
-  <feature name="Hotel">
-    <category>accommodation</category>
-    <icon image="features/pois/accommodation_hotel.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>
-    <point/>
-    <area/>
-    <tag k="tourism" v="hotel"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Motel">
-    <category>accommodation</category>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help>
-    <point/>
-    <area/>
-    <icon image="features/pois/accommodation_motel.n.24.png"/>
-    <tag k="tourism" v="motel"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Hostel">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>
-    <tag k="tourism" v="hostel"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- Note that tourism=bed_and_breakfast also gets some use. -->
-  <feature name="Guesthouse (B&amp;B)">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>
-    <tag k="tourism" v="guest_house"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Campsite">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_camping.n.24.png"/>
-    <tag k="tourism" v="camp_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Caravan park">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_caravan_park.n.24.png"/>
-    <tag k="tourism" v="caravan_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Alpine hut">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_alpinehut.n.24.png"/>
-    <tag k="tourism" v="alpine_hut"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Chalet">
-    <category>accommodation</category>
-    <icon image="features/pois/accommodation_chalet.n.24.png"/>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <tag k="tourism" v="chalet"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <!-- ========= Tourism ========= -->
-  <feature name="Attraction">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_attraction.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="attraction"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Museum">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_museum.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help>
-    <point/>
-    <area/>
-    <tag k="tourism" v="museum"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Archaeological">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_archaeological.n.24.png"/>
-    <tag k="historic" v="archaeological_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Battlefield">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_battlefield.n.24.png"/>
-    <tag k="historic" v="battlefield"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Castle">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_castle.n.24.png"/>
-    <tag k="historic" v="castle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Memorial">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_memorial.n.24.png"/>
-    <tag k="historic" v="memorial"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Monument">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_monument.n.24.png"/>
-    <tag k="historic" v="monument"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Picnic site">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_picnic.n.24.png"/>
-    <tag k="tourism" v="picnic_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Ruins">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_ruin.n.24.png"/>
-    <tag k="historic" v="ruins"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cinema">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_cinema.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="cinema"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Theatre">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_theatre.n.24.png"/>
-    <tag k="amenity" v="theatre"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Viewpoint">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_view_point.n.24.png"/>
-    <tag k="tourism" v="viewpoint"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Zoo">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <icon image="features/pois/tourist_zoo.n.24.png"/>
-    <tag k="tourism" v="zoo"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Information">
-    <category>tourism</category>
-    <icon image="features/pois/amenity_information.n.24.png"/>
-    <point/>
-    <tag k="tourism" v="information"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Artwork">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_art_gallery2.n.24.png"/>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <tag k="tourism" v="artwork"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Theme park">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_theme_park.n.24.png"/>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <tag k="tourism" v="theme_park"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
deleted file mode 100644
index a6462be6d..000000000
--- a/public/potlatch2/map_features/transport.xml
+++ /dev/null
@@ -1,571 +0,0 @@
-<featureGroup>
-    <feature name="Railway line">
-        <category>transport</category>
-        <icon image="features/railway__rail.png">
-          <font size="14pt">
-            <b>${name}</b>
-          </font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="rail"/>
-        <inputSet ref="bridge"/>
-        <inputSet ref="tunnel"/>
-        <inputSet ref="embankment-cutting"/>
-        <inputSet ref="rail-electrification"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-        
-      </feature>
-    
-    
-      <feature name="Railway spur">
-        <category>transport</category>
-        <icon image="features/railway__spur.png">
-          <font size="14pt">
-            <b>${name}</b>
-          </font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="rail"/>
-        <tag k="service" v="spur"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Railway siding">
-        <category>transport</category>
-        <icon image="features/railway__siding.png">
-          <font size="14pt">
-            <b>${name}</b>
-          </font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="rail"/>
-        <tag k="service" v="siding"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Preserved line">
-        <category>transport</category>
-        <icon image="features/railway__preserved.png">
-          <font size="14pt"><b>${name}</b></font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="preserved"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Disused tracks">
-        <category>transport</category>
-        <icon image="features/railway__disused.png">
-          <font size="14pt">
-            <b>${name}</b>
-          </font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="disused"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Old trackbed">
-        <category>transport</category>
-        <icon image="features/railway__abandoned.png">
-          <font size="14pt"><b>${name}</b></font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="abandoned"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Light rail line">
-        <category>transport</category>
-        <icon image="features/railway__light.png">
-          <font size="14pt">
-            <b>${name}</b>
-          </font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="light_rail"/>
-        <inputSet ref="bridge"/>
-        <inputSet ref="tunnel"/>
-        <inputSet ref="embankment-cutting"/>
-        <inputSet ref="rail-electrification"/>
-        <inputSet ref="common"/>
-        <inputSet ref="tram-route"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Tram line">
-        <category>transport</category>
-        <icon image="features/railway__tram.png">
-          <font size="14pt"><b>${name}</b></font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="tram"/>
-        <inputSet ref="tram-route"/>
-        <inputSet ref="bridge"/>
-        <inputSet ref="tunnel"/>
-        <inputSet ref="embankment-cutting"/>
-        <inputSet ref="rail-electrification"/>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Subway line">
-        <category>transport</category>
-        <icon image="features/railway__subway.png">
-          <font size="14pt">
-            <b>${name}</b>
-          </font>
-        </icon>
-    
-        <line/>
-        <tag k="railway" v="subway"/>
-        <inputSet ref="bridge"/>
-        <inputSet ref="tunnel"/>
-        <inputSet ref="embankment-cutting"/>
-        <inputSet ref="rail-electrification"/>
-        <inputSet ref="common"/>
-        <inputSet ref="train-route"/>
-      </feature>
-    
-    
-      <feature name="Railway platform">
-        <category>transport</category>
-        <icon image="features/railway__platform.png"/>
-        <line/>
-        <area/>
-        <tag k="railway" v="platform"/>
-        <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The number of the platform" priority="low"/>
-        <inputSet ref="common"/>
-      </feature>
-    
-  <feature name="Car Wash">
-    <category>transport</category>
-    <icon image="features/pois/transport_car_wash.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcar_wash</help>
-    <point/>
-    <tag k="amenity" v="car_wash"/>
-    <inputSet ref="names"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The company/organisation that runs the car wash" priority="low"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Opening hours" key="opening_hours" priority="normal"/>
-    <input type="choice" presence="onTagMatch" category="Details" name="Self service" key="self_service" priority="low">
-    	<choice value="yes" text="Yes" />
-    	<choice value="no" text="No" />
-    </input>
-    <input type="choice" presence="onTagMatch" category="Details" name="Automated" key="automated" priority="low">
-    	<choice value="yes" text="Yes" />
-    	<choice value="no" text="No" />
-    </input>
-    
-    <inputSet ref="common"/>
-  </feature>
-    
-      <feature name="Bus station">
-        <category>transport</category>
-        <icon image="features/amenity__bus_station.png">
-          <b>${name} ${addr:housename}</b><br/>
-          ${addr:housenumber} ${addr:street} ${addr:postcode}
-        </icon>
-    
-        <area/>
-        <tag k="amenity" v="bus_station"/>
-        <inputSet ref="names"/>
-        <inputSet ref="isBuilding"/>
-        <inputSet ref="buildingAddress"/>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Airport">
-        <category>transport</category>
-        <icon image="features/aeroway__aerodrome.png" dnd="features/pois/transport_airport.n.24.png"/>
-        <tag k="aeroway" v="aerodrome"/>
-        <area/>
-        <point/>
-        <inputSet ref="names"/>
-        <input type="freetext" presence="always" category="Details" name="International Air Transport Association (IATA) airport code" key="ref"/>
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Airport terminal">
-        <category>transport</category>
-        <icon image="features/aeroway__terminal.png" dnd="features/pois/transport_airport_terminal.n.24.png"/>
-        <tag k="aeroway" v="terminal"/>
-        <area/>
-        <point/>
-        <inputSet ref="names"/>
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Helipad">
-        <category>transport</category>
-        <icon image="features/aeroway__helipad.png" dnd="features/pois/transport_helicopter_pad.n.24.png"/>
-        <tag k="aeroway" v="helipad"/>
-        <area/>
-        <point/>
-        <inputSet ref="names"/>
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Airport runway">
-        <category>transport</category>
-        <icon image="features/aeroway__runway.png"/>
-        <tag k="aeroway" v="runway"/>
-        <line/>
-        <inputSet ref="names"/>
-        <input type="freetext" presence="always" category="Details" name="Runway number (01-36)" key="ref"/>
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Airport taxiway">
-        <category>transport</category>
-        <icon image="features/aeroway__taxiway.png"/>
-        <tag k="aeroway" v="taxiway"/>
-        <line/>
-        <inputSet ref="names"/>
-        <input type="freetext" presence="always" category="Details" name="Taxiway number" key="ref" />
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Airport apron">
-        <category>transport</category>
-        <icon image="features/aeroway__apron.png"/>
-        <tag k="aeroway" v="apron"/>
-        <area/>
-        <inputSet ref="names"/>
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-    
-    
-      <feature name="Airport gate">
-        <category>transport</category>
-        <icon image="features/pois/transport_airport_gate.n.24.png"/>
-        <tag k="aeroway" v="gate"/>
-        <point/>
-        <input type="freetext" presence="always" category="Details" name="Gate number" key="ref"/>
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
-        <inputSet ref="common"/>
-      </feature>
-      
-      
-<feature name="Aerodrome">
-    <category>aeroway</category>
-    <icon image="features/aeroway__aerodrome.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>
-    <point/>
-    <tag k="aeroway" v="aerodrome"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bus Stop">
-    <category>transport</category>
-    <icon image="features/pois/transport_bus_stop2.n.24.png">
-      ${name} ${local_ref}
-    </icon>
-    <point/>
-    <tag k="highway" v="bus_stop"/>
-    <inputSet ref="buses"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Car Parking">
-    <category>transport</category>
-    <icon image="features/amenity__parking.png" dnd="features/pois/transport_parking_car.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="parking"/>
-    <inputSet ref="names"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
-    <input type="choice" presence="always" category="Parking" name="Type" key="parking" priority="high">
-      <choice value="surface" text="Surface (outdoor)" />
-      <choice value="multi-storey" text="Multi-storey" />
-      <choice value="underground" text="Underground" />
-      <choice value="garage" text="Garage" />
-      <choice value="park_and_ride" text="Park-and-ride" />
-      <choice value="garage_boxes" text="Garage boxes" />
-    </input>
-    <input type="freetext" presence="onTagMatch" category="Parking" name="Maximum stay" key="maxstay" description="The maximum permitted duration of parking (eg, 4h)."/>
-    <inputSet ref="fee"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bicycle Parking">
-    <category>transport</category>
-    <icon image="features/pois/transport_parking_bicycle.n.24.png">
-      ${name} ${capacity}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking</help>
-    <point/>
-    <tag k="amenity" v="bicycle_parking"/>
-    <inputSet ref="names"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <input type="number" minimum="0" maximum="99999" stepSize="1"
-        presence="always" category="Cycle" name="Capacity" key="capacity"
-        description="The number of bicycles that can be parked in the group of bicycle parking racks"/>
-    <inputSet ref="fee"/>
-    <input type="choice" presence="always" category="Cycle" name="Covered" key="covered" description="Is the cycle parking covered, so that the bikes are kept dry?">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Railway station">
-    <category>transport</category>
-    <icon image="features/pois/transport_train_station.n.24.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <point/>
-    <tag k="railway" v="station"/>
-    <inputSet ref="names"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the service" priority="low"/>
-    <input type="number" minimum="1" maximum="99999" stepSize="1" presence="onTagMatch" category="Details" name="Platforms" key="platforms" description="The number of passenger platforms at the station" priority="low"/>
-    <inputSet ref="common"/>
-    <inputSet ref="train-route"/>
-    
-  </feature>
-
-
-  <feature name="Fuel">
-    <category>transport</category>
-    <point />
-    <inputSet ref="simpleName" />
-    <icon image="features/pois/transport_fuel.n.24.png" />
-    <tag k="amenity" v="fuel"/>
-    <inputSet ref="simpleBrand"/>
-    <inputSet ref="simpleOperator"/>
-
-    <input type="choice" category="Details" name="Diesel" key="fuel:diesel" description="Is diesel fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="GTL Diesel" key="fuel:GTL_diesel" description="Is GTL diesel fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="HGV Diesel" key="fuel:HGV_diesel" description="Is HGV diesel fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Biodiesel" key="fuel:biodiesel" description="Is biodiesel unleaded fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Octane 91" key="fuel:octane_91" description="Is octane 91 unleaded fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Octane 95" key="fuel:octane_95" description="Is octane 95 unleaded fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Octane 98" key="fuel:octane_98" description="Is octane 98 unleaded fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Octane 100" key="fuel:octane_100" description="Is octane 100 unleaded fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Mixture 1:25" key="fuel:1_25" description="Is mixture 1:25 fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Mixture 1:50" key="fuel:1_50" description="Is mixture 1:50 fuel sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="E10" key="fuel:e10" description="Is E10 sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="E85" key="fuel:e85" description="Is E85 sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Biogas" key="fuel:biogas" description="Is biogas sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="CNG" key="fuel:cng" description="Is CNG sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="LPG" key="fuel:lpg" description="Is LPG sold here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <input type="choice" category="Details" name="Electricity" key="fuel:electricity" description="Is it possible to charge an electric car here?" priority="low">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bus station">
-    <category>transport</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/transport_bus_station.n.24.png"/>
-    <tag k="amenity" v="bus_station"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Taxi rank">
-    <category>transport</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/transport_taxi_rank.n.24.png"/>
-    <tag k="amenity" v="taxi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Tram stop">
-    <category>transport</category><point/><inputSet ref="simpleName" />
-    <icon image="features/pois/transport_tram_stop.n.24.png"/>
-    <tag k="railway" v="tram_stop"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bicycle rental">
-    <category>transport</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
-    <tag k="amenity" v="bicycle_rental"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Car rental">
-    <category>transport</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/transport_rental_car.n.24.png"/>
-    <tag k="amenity" v="car_rental"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Ferry Terminal">
-    <category>transport</category>
-    <icon image="features/pois/transport_port.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>
-    <point/>
-    <tag k="amenity" v="ferry_terminal"/>
-    <inputSet ref="simpleName" />
-    <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- public transit routes -->
-  <feature name="Bus Route">
-    <category>transport</category>
-    <icon image="features/route__bus.png">
-      <font size="12pt">
-        ${operator} <b>${ref}</b>
-      </font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="bus"/>
-
-    <inputSet ref="route"/>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
-    <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the bus service" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Tram Route">
-    <category>transport</category>
-    <icon image="features/transport__tram.png">
-      <font size="12pt">
-        ${operator} <b>${reg}</b>
-      </font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="tram"/>
-
-    <inputSet ref="route"/>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
-    <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the tram service" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Train Route">
-    <category>transport</category>
-    <icon image="features/transport__railway.png">
-      <font size="12pt">
-        ${name|operator} <b>(${ref})</b>
-      </font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
-    <tag k="route" v="train"/>
-    <input type="freetext" presence="always" category="Details" name="Name" priority="high" key="name" description="Official route name"/>
-    <input type="freetext" presence="always" category="Details" name="Reference" priority="high" key="ref" description="The official reference number"/>
-    <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the train service" priority="high"/>
-    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the train service" priority="low"/>
-    <input type="freetext" presence="onTagMatch" category="Details" name="Colour code" key="colour" description="Official colour designation for the route, if any." priority="low" />
-    <inputSet ref="source"/>
-    <inputSet ref="wheelchair-basic" />
-  </feature>
-
-      
-</featureGroup>
diff --git a/public/potlatch2/map_features/water.xml b/public/potlatch2/map_features/water.xml
deleted file mode 100644
index e58c0c331..000000000
--- a/public/potlatch2/map_features/water.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<featureGroup>
-  <feature name="Stream">
-    <category>water</category>
-    <description>A very narrow river.</description>
-    <icon image="features/waterway__stream.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <line/>
-    <tag k="waterway" v="stream"/>
-    <inputSet ref="waterways"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="River">
-    <category>water</category>
-    <icon image="features/waterway__river.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-
-    <line/>
-    <tag k="waterway" v="river"/>
-    <inputSet ref="waterways"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Canal">
-    <category>water</category>
-    <icon image="features/waterway__canal.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <line/>
-    <tag k="waterway" v="canal"/>
-    <inputSet ref="waterways"/>
-    <inputSet ref="tunnel"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Drain">
-    <category>water</category>
-    <icon image="features/waterway__drain.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-
-    <line/>
-    <tag k="waterway" v="drain"/>
-    <inputSet ref="tunnel"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Dam">
-    <category>water</category>
-    <description>A structure for holding water in a reservoir</description>
-    <icon image="features/waterway__dam.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <line/>
-    <area/>
-    <tag k="waterway" v="dam"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Riverbank">
-    <category>water</category>
-    <icon image="features/waterway__riverbank.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-
-    <area/>
-    <tag k="waterway" v="riverbank"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Reservoir">
-    <category>water</category>
-    <icon image="features/waterway__reservoir.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <area/>
-    <tag k="landuse" v="reservoir"/>
-    <inputSet ref="boatPermissions"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Lake">
-    <category>water</category>
-    <icon image="features/waterway__lake.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-    <area/>
-    <tag k="natural" v="water"/>
-    <inputSet ref="names"/>
-    <inputSet ref="boatPermissions"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Basin">
-    <category>water</category>
-    <icon image="features/waterway__basin.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <area/>
-    <tag k="landuse" v="basin"/>
-    <inputSet ref="boatPermissions"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Weir">
-    <category>water</category>
-    <icon image="features/waterway__weir.png" dnd="features/pois/transport_weir.n.24.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <line/>
-    <point/>
-    <tag k="waterway" v="weir"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Dock">
-    <category>water</category>
-    <icon image="features/waterway__dock.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <area/>
-    <tag k="waterway" v="dock"/>
-    <inputSet ref="names"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Marina">
-    <category>water</category>
-    <icon image="features/waterway__marina.png" dnd="features/pois/transport_marina.n.24.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <area/>
-    <point/>
-    <tag k="leisure" v="marina"/>
-    <inputSet ref="names"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Slipway">
-    <category>water</category>
-    <icon image="features/waterway__slipway.png" dnd="features/pois/transport_slipway.n.24.png"/>
-    <point/>
-    <line/>
-    <tag k="leisure" v="slipway"/>
-    <inputSet ref="names"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Coastline">
-    <category>water</category>
-    <description>The average high tide line, with water on the right-hand side</description>
-    <icon image="features/waterway__coastline.png" />
-    <line/>
-    <tag k="natural" v="coastline"/>
-    <inputSet ref="common"/>
-  </feature>
-</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/stylesheets.xml b/public/potlatch2/stylesheets.xml
deleted file mode 100644
index 0e1d910a3..000000000
--- a/public/potlatch2/stylesheets.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<stylesheets>
-	<stylesheet>
-		<name>Potlatch</name>
-		<url>stylesheets/potlatch.css</url>
-	</stylesheet>
-	<stylesheet>
-		<name>Wireframe</name>
-		<url>stylesheets/wireframe.css</url>
-	</stylesheet>
-	<stylesheet>
-		<name>Enhanced</name>
-		<url>stylesheets/enhanced.css</url>
-	</stylesheet>
-	<stylesheet>
-		<name>Network</name>
-		<url>stylesheets/network.css</url>
-	</stylesheet>
-    <stylesheet>
-        <name>OpenCycleMap</name>
-        <url>stylesheets/opencyclemap.css</url>
-    </stylesheet>
-    <stylesheet>
-        <name>GPS</name>
-        <url>stylesheets/gpx.css</url>
-        <corestyle>no</corestyle>
-    </stylesheet>
-    <stylesheet>
-        <name>Bugs</name>
-        <url>stylesheets/bugs.css</url>
-        <corestyle>no</corestyle>
-    </stylesheet>
-</stylesheets>
diff --git a/public/potlatch2/stylesheets/bikeshops.css b/public/potlatch2/stylesheets/bikeshops.css
deleted file mode 100644
index cd74a7fff..000000000
--- a/public/potlatch2/stylesheets/bikeshops.css
+++ /dev/null
@@ -1,3 +0,0 @@
-node  { z-index: 9;
-            icon-image: features/bike-shop.png;
-            text-offset: 28; font-family: DejaVu; text: name; font-size: 9; text_color: red; width: 50;}
\ No newline at end of file
diff --git a/public/potlatch2/stylesheets/bugs.css b/public/potlatch2/stylesheets/bugs.css
deleted file mode 100644
index 68bd474f9..000000000
--- a/public/potlatch2/stylesheets/bugs.css
+++ /dev/null
@@ -1,9 +0,0 @@
-node[status=fixed] { z-index: 2;
-            icon-image: features/bugs/fixed.png; }
-
-node[status=invalid] { z-index: 2;
-            icon-image: features/bugs/invalid.png; }
-
-node[status=open]  { z-index: 2;
-            icon-image: features/bugs/open.png;
-            text-offset: 14; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
\ No newline at end of file
diff --git a/public/potlatch2/stylesheets/core_interactive.css b/public/potlatch2/stylesheets/core_interactive.css
deleted file mode 100644
index addf821cd..000000000
--- a/public/potlatch2/stylesheets/core_interactive.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Turn restrictions */
-
-relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
-
-/* Interactive way behaviour */
-
-way::highlight :hover	{ z-index: 2; width: eval('_width+10'); color: #ffff99; }
-way::highlight :hover :background { color: lightcyan; }
-way::highlight :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
-way::highlight :selected :background { color: cyan; }
-way::highlight :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
-way::highlight :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
-/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
-way !:drawn { z-index:10; width: 1; color: #333333; }
-way :tiger { casing-color: #ff00ff;}
-
-/* Interactive node behaviour */
-
-node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
-node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; layer: 5; }
-node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #00ac00; casing-color: #004400; casing-width: 1; }
-node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #BBB; casing-color: #333; casing-width: 1; }
-node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 10; color: black; layer: 5; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
-node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
-node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
-node::selectedNode :selected :background { color: cyan; }
-node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css
deleted file mode 100644
index 26adf27f9..000000000
--- a/public/potlatch2/stylesheets/core_landuse.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Landuse */
-
-way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
-way[natural=beach] :area                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; set .area_small_name;}
-way[natural=coastline]						{ color: black; width: 3; }
-way[landuse] :area                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
-way[landuse=residential] :area              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
-way[landuse=retail] :area                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
-way[landuse=commercial] :area               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
-way[landuse=military] :area                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; }
-way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
-/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
-way[leisure] :area                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
-way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
-way[historic] :area,way[ruins] :area        { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
-way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
-way[building] :area                         { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
-way[natural=water],
-way[waterway][waterway!=dam] :area          { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; set .area_small_name;}
-way[waterway=dam]							{ color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
-way[man_made] :area							{ color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
-way[man_made=reservoir_covered] :area       { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
-way[landuse=reservoir] :area                { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; set .area_small_name;}
-way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
-way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
-way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
-way[leisure=pitch] :area					{ z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;}
-way[landuse=recreation_ground] :area        { color: green; fill-color: green; set .area_small_name;}
-way[amenity=parking] :area                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
-way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
-way[man_made=pier]							{ z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;}
-way[man_made=pier][floating=yes]			{ dashes: 4,2; casing-color: #444;}
-way[leisure=marina] :area					{ color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}
-way[leisure=slipway]						{ color: grey; width: 3; casing-color: #3434ff; casing-width: 2; }
-way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
-way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
-/* Perhaps should be filled, on lower zooms. */
-way[boundary=national_park]                 { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
-way[boundary=protected_area]                { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 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: 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 */
diff --git a/public/potlatch2/stylesheets/core_pois.css b/public/potlatch2/stylesheets/core_pois.css
deleted file mode 100644
index 439c06c16..000000000
--- a/public/potlatch2/stylesheets/core_pois.css
+++ /dev/null
@@ -1,88 +0,0 @@
-node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 10; font-weight: bold; z-index: 20; }
-node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
-node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
-node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
-node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; }
-node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
-node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
-node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
-node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
-node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
-node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
-node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; }
-node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; }
-node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; }
-node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; }
-node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; }
-node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; }
-node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; }
-node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; }
-node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
-node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
-node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
-node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }
-node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
-node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
-node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-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[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; }
-node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
-node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
-node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
-node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
-node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
-node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
-node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
-node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
-node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
-node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
-node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
-node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
-node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
-node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
-node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; }
-node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; }
-node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
-node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
-node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
-node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
-node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
-node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
-node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
-node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
-node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
-node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
-node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
-node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
-node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
-node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
-node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
-node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
-node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
-node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
-node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
-node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; font-size: 10; z-index: 20; }
-node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
-node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
-node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
-node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
-node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
-node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
-node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
-
-/* Addressing */
-
-node[addr:housenumber] !:drawn,
-node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; }
-way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
diff --git a/public/potlatch2/stylesheets/core_relations.css b/public/potlatch2/stylesheets/core_relations.css
deleted file mode 100644
index a2d5a7437..000000000
--- a/public/potlatch2/stylesheets/core_relations.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Route relations */
-
-relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0.3; }
-relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; }
-relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
-relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; }
-relation[type=route][route=mtb] way::route { z-index: 1; width: 12; color: brown; opacity: 0.3; }
-relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css
deleted file mode 100644
index 4824facb7..000000000
--- a/public/potlatch2/stylesheets/core_ways.css
+++ /dev/null
@@ -1,134 +0,0 @@
-
-/* Roads */
-
-way[highway=motorway],way[highway=motorway_link],
-way[highway=trunk],way[highway=trunk_link],
-way[highway=primary],way[highway=primary_link],
-way[highway=secondary],way[highway=secondary_link],
-way[highway=tertiary],way[highway=tertiary_link],
-way[highway=residential],way[highway=unclassified]  { text: name; text-color: black; font-size: 12; text-position: offset; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round }
-way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; }
-way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; }
-way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; }
-way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; }
-way[highway=tertiary],way[highway=tertiary_link]    { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; }
-way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; }
-way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; }
-way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 1; }
-way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; }
-way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; }
-way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 1; }
-way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; }
-
-/* Road areas */
-
-way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;}
-way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
-
-/* Paths */
-
-way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
-way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
-way[highway=footway][bicycle=yes]::bike   { z-index: 4; color: blue; width: 1; }
-way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;}
-way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; set .path;}
-way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
-way[highway=cycleway]  { color: blue; width: 2; dashes: 4, 2; set .path;}
-way .path              { text: name; text-color: black; text-position: offset; text-offset: 7; font-size: 12; }
-
-/* Under construction */
-
-way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
-way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;}
-
-/* Railways */
-
-way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; }
-way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; }
-
-way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
-way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
-
-way[railway=platform] { color:black; width: 2; }
-
-way[railway=subway] { z-index: 6; color: #444444; width: 5; }
-way[railway=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 8,8; }
-
-way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
-way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
-
-way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
-way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
-
-way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
-way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
-
-way[railway=light_rail] { z-index: 6; color: black; width: 4; }
-way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; }
-
-way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
-way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
-
-/* 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][tunnel=yes]                {dashes: 8,4;}
-
-/* Aeroways */
-
-way[aeroway=aerodrome] :area
-    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 1;  }
-way|z-15[aeroway=aerodrome] :area
-    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
-way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
-way[aeroway=taxiway]  :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } 
-
-way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
-way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; }
-way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; }
-way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
-
-way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5;  }
-way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
-way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; }
-way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
-
-way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3;  }
-
-way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; } 
-way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} 
-
-/* Barriers */
-
-way[barrier] {color: #000000; width: 1}
-way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
-
-/* Power */
-
-way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;}
-way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;}
-way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;}
-way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;}
-
-/* Leisure */
-
-way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 2; }
-way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; }
-
-
-/* Physical decoration */
-
-way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); }
-way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: eval('_width+6'); }
-way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); }
-way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
-
-/* Attribute decoration */
-
-way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; }
-way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }
diff --git a/public/potlatch2/stylesheets/enhanced.css b/public/potlatch2/stylesheets/enhanced.css
deleted file mode 100644
index 23966e004..000000000
--- a/public/potlatch2/stylesheets/enhanced.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-	Potlatch 2 enhanced stylesheet
-
-	The aim of this stylesheet is to provide a fuller, more detailed rendering of additional attributes
-	(e.g. direction, access) used at times by the moderately experienced mapper.
-	
-*/
-
-@import("stylesheets/core_ways.css");
-@import("stylesheets/core_pois.css");
-@import("stylesheets/core_landuse.css");
-
-/* Access */
-
-way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
-way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
-
-/* Physical */
-
-way[embankment=yes]::hatches, way[cutting=yes]::hatches
-    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
-
-/* Interactive behaviour */
-
-@import("stylesheets/core_relations.css");
-way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
-@import("stylesheets/core_interactive.css");
-
-/* Direction on selected ways */
-
-way[highway][!oneway][junction!=roundabout]::direction :selected,
-way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
-way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
-way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
-
diff --git a/public/potlatch2/stylesheets/gpx.css b/public/potlatch2/stylesheets/gpx.css
deleted file mode 100644
index 806048920..000000000
--- a/public/potlatch2/stylesheets/gpx.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-
-	Wireframe stylesheet for GPS tracks
-	
-*/
-
-way { z-index: 2; width: 1; color: cyan; } 
-node :poi { z-index: 2; 
-			icon-image: circle; icon-width: 8; color: orange; 
-			casing-color: red; casing-width: 1; 
-			text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
-
diff --git a/public/potlatch2/stylesheets/network.css b/public/potlatch2/stylesheets/network.css
deleted file mode 100644
index d2a60a9fb..000000000
--- a/public/potlatch2/stylesheets/network.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-	Potlatch 2 network stylesheet
-
-	This is a variant of the enhanced stylesheet _without_ landuse and similar polygons. The aim is to 
-	prevent such items distracting the mapper and leading to unwanted junctions (and slowing down
-	rendering!).
-	
-*/
-
-@import("stylesheets/core_ways.css");
-@import("stylesheets/core_pois.css");
-
-/* Access */
-
-way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
-way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
-
-/* Physical */
-
-way[embankment=yes]::hatches, way[cutting=yes]::hatches
-    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
-
-/* Interactive behaviour */
-
-@import("stylesheets/core_relations.css");
-way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
-@import("stylesheets/core_interactive.css");
-
-/* Direction on selected ways */
-
-way[highway][!oneway][junction!=roundabout]::direction :selected,
-way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
-way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
-way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
-
diff --git a/public/potlatch2/stylesheets/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css
deleted file mode 100644
index 4274f6686..000000000
--- a/public/potlatch2/stylesheets/opencyclemap.css
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-
-	Stylesheet that mimicks, to a certain extent, opencyclemap
-        Andy Allan, June 2010
-
-	Based heavily on:
-	MapCSS demonstration stylesheet
-	Richard Fairhurst, October 2009
-	
-*/
-
-/* This rule applies to all areas (closed ways). Note that rules are applied in the order
-  they appear in the file, so later rules may replace this one for some ways.
-  This is used as a debugger for finding unstyled areas; it's obviously oversimplistic since
-  it picks up closed-loop highways. */
-
-way :area { color: grey; width: 1; fill-color: red; fill-opacity: 0.1; }
-
-/* A set of fairly standard rules.
-  We use z-index to make sure high-priority roads appear above minor ones.
-  The default z-index is 5. If an object matches multiple rules with the same
-  z-index then the rules are "merged" (but individual properties become one or the other)  */
-
-/*way[highway=motorway],way[highway=motorway_link],
-way[highway=trunk],way[highway=trunk_link],
-way[highway=primary],way[highway=primary_link],
-way[highway=secondary],way[highway=secondary_link],
-way[highway=tertiary],way[highway=tertiary_link],
-way[highway=residential]                             { text: name; text-color: black; font-size: 7; text-position: line;}*/
-way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 1; }
-way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 1; }
-way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 1; }
-way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 1; }
-way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 1; }
-way[highway=residential]                            { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 1; }
-way[highway=service]                                { color: white; width: 3; casing-color: #999; casing-width: 1; }
-
-/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
-area=yes tag should be filled. The below doesn't yet work as intended. */
-way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; }
-way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
-
-way[highway=steps]     { color: #be6c6c; width: 2; dashes: 4, 2; }
-way[highway=footway]   { color: #be6c6c; width: 2; dashes: 6, 3; }
-way[highway=cycleway]  { color: blue; width: 1.6; dashes: 5, 4; }
-way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; }
-way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; }
-way[highway=path]      { color: lightgreen; width: 2; dashes: 2, 2; }
-
-way[waterway=river], way[waterway=canal] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
-
-way[barrier] {color: #000000; width: 1}
-
-/* Fills can be solid colour or bitmap images */
-
-
-way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
-way[landuse] :area                          { color: #efefef; width: 1; fill-color: #f5f5f5; fill-opacity: 0.3; }
-way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
-way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
-way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; }
-way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; }
-way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; }
-way[building] :area                         { color: #8d8d8d; width: 1; fill-color: #e0e0e0; fill-opacity: 0.2; }
-way[natural=water],
-way[waterway] :area               { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; }
-way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; }
-way[leisure=pitch],way[leisure=park]        { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.2; }
-way[amenity=parking] :area                  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.2; }
-way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
-
-/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
-
-node[addr:housenumber],
-node[addr:housename] { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; }
-way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
-
-/* POIs, too, can have bitmap icons - they can even be transparent */
-
-node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; }
-/*node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; }
-node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; }
-node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; }
-node[amenity=atm] { icon-image: icons/atm.png; }
-node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; }
-node[highway=bus_stop] { icon-image: icons/bus_stop.png; }
-node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; }
-node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; }
-node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; }
-node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; }
-node[amenity=fire_station] { icon-image: icons/fire_station.png; }
-node[amenity=hospital] { icon-image: icons/hospital.png; }
-node[tourism=hotel] { icon-image: icons/hotel.png; }
-node[amenity=parking] { icon-image: icons/parking.png; } */
-node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; text-color: blue }
-/* node[amenity=pharmacy] { icon-image: icons/pharmacy.png; }
-node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; }
-node[amenity=police] { icon-image: icons/police.png; }
-node[amenity=post_box] { icon-image: icons/post_box.png; }
-node[amenity=recycling] { icon-image: icons/recycling.png; }
-node[amenity=restaurant] { icon-image: icons/restaurant.png; }
-node[amenity=school] { icon-image: icons/school.png; }
-node[amenity=taxi] { icon-image: icons/taxi.png; }
-node[amenity=telephone] { icon-image: icons/telephone.png; }
-way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; }
-node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/
-	
-/* We can stack styles at different z-index (depth) */
-
-way[railway=rail] { z-index: 6; color: #444444; width: 5; }
-way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; }
-way[railway=platform] { color:black; width: 2; }
-way[railway=subway] { z-index: 6; color: #444444; width: 5; }
-way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; }
-
-/* Bridge */
-way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1  { z-index: 4; color: white; width: eval('_width+3'); }
-way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2  { z-index: 3; color: black; width: eval('_width+6'); }
-    
-/* Tunnel */
-way[tunnel=yes]::tunnel1 { z-index: 4; color: white; width: eval('_width+2'); }
-way[tunnel=yes]::tunnel2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
-
-/* Oneway */
-way[oneway=yes]::arrows { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; }
-
-
-/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */
-
-way .highlighted { color: pink; }
-
-/* Interactive editors may choose different behaviour when a user mouses-over or selects
-   an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */
-
-@import("stylesheets/core_interactive.css");
-
-/* Descendant selectors provide an easy way to style relations: this example means "any way
-   which is part of a relation whose type=route". */
-
-relation[type=route] way::routeline { z-index: 1; width: 17; color: yellow; opacity: 0.3; }
-relation[type=route][route=bicycle][network=ncn] way::routeline { z-index: 1; width: 12; color: red; opacity: 0.3; }
-relation[type=route][route=bicycle][network=rcn] way::routeline { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
-relation[type=route][route=bicycle][network=lcn] way::routeline { z-index: 1; width: 12; color: blue; opacity: 0.3; }
-relation[type=route][route=bicycle][network=mtb] way::routeline { z-index: 1; width: 12; color: #48a448; opacity: 0.3; }
-
-
-
diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css
deleted file mode 100644
index 8774333f3..000000000
--- a/public/potlatch2/stylesheets/potlatch.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-
-	Potlatch 2 core stylesheet
-	
-	This stylesheet should contain commonly used features and only the most essential extra attributes
-	(e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in
-	order not to kill performance on slower systems and those with a less effective Flash Player (i.e. 
-	Linux).
-	
-	It is expected that experienced mappers will switch between this and other stylesheets as required.
-
-*/
-
-@import("stylesheets/core_ways.css");
-@import("stylesheets/core_pois.css");
-@import("stylesheets/core_landuse.css");
-@import("stylesheets/core_relations.css");
-way .area_small_name {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
-@import("stylesheets/core_interactive.css");
-
-/* Rendering for licence status */
-
-way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: #AA0000; }
-way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
-way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; }
-node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; }
-node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
-node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }
diff --git a/public/potlatch2/stylesheets/snapshot.css b/public/potlatch2/stylesheets/snapshot.css
deleted file mode 100644
index 891ead686..000000000
--- a/public/potlatch2/stylesheets/snapshot.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-
-	Stylesheet that does simple wireframe display
-
-*/
-
-way :hover	{ z-index: 2; width: 14; color: yellow; linecap: round; }
-way :selected { z-index: 2; width: 14; color: yellow; linecap: round; }
-way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; }
-
-node :selectedway { z-index: 8; icon-image: circle; icon-width: 16; color: green; }
-node :hoverway { z-index: 9; icon-image: circle; icon-width: 16; color: blue; }
-node :selected { z-index: 9; icon-image: circle; icon-width: 16; color: red; casing-color: black; casing-width: 1; }
-node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 16; color: green; casing-color: black; casing-width: 1; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 16; color: black; }
-node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 16; color: black; }
-
-way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; }
-way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; }
-way[_status=complete] { opacity: 0.7; }
-node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 24; color: #d95f02; }
-node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 20; color: #1b9e77; opacity: 0.4; }
-node[_status=complete] { opacity: 0.7; }
-
-
-
diff --git a/public/potlatch2/stylesheets/wireframe.css b/public/potlatch2/stylesheets/wireframe.css
deleted file mode 100644
index e3e408ce8..000000000
--- a/public/potlatch2/stylesheets/wireframe.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-
-	Stylesheet that does simple wireframe display
-	
-*/
-
-way :hover	{ z-index: 2; width: 1; color: blue; }
-way :selected { z-index: 2; width: 1; color: red; }
-way !:drawn { z-index:10; width: 1; color: black; } 
-
-node :selectedway { z-index: 8; icon-image: square; icon-width: 6; color: green; }
-node :hoverway { z-index: 9; icon-image: square; icon-width: 6; color: blue; }
-node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; }
-node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 6; color: black; }
-node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
-
diff --git a/public/potlatch2/vectors.xml b/public/potlatch2/vectors.xml
deleted file mode 100644
index 3d260d45d..000000000
--- a/public/potlatch2/vectors.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<vectors>
-    <set loaded="true">
-      <name>Mapdust Bugs</name>
-      <loader>BugLoader</loader>
-      <url>http://www.mapdust.com/api/</url>
-      <details>http://www.mapdust.com/detail/</details>
-      <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
-    </set>
-    <set disabled="true" loaded="true">
-      <name>Mapdust Bugs - Test server</name>
-      <loader>BugLoader</loader>
-      <url>http://80.242.147.84/osmbugs/api/</url>
-      <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
-    </set>
-    <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
-      <name>Bike Shop Locator - Missing Shops</name>
-      <loader>BikeShopLoader</loader>
-      <url>http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/</url>
-    </set>
-    <set>
-      <name>Everyone's GPS tracks</name>
-      <loader>TrackLoader</loader>
-      <!-- doesn't need a URL -->
-    </set>
-    <set disabled="true">
-      <name>CNXC</name>
-      <loader>SnapshotLoader</loader>
-      <policyfile>http://localhost:3000/crossdomain.xml</policyfile>
-      <url>http://localhost:3000/api/</url>
-    </set>
-</vectors>
diff --git a/public/potlatch2/help/introduction.jpg b/vendor/assets/potlatch2/help/introduction.jpg
similarity index 100%
rename from public/potlatch2/help/introduction.jpg
rename to vendor/assets/potlatch2/help/introduction.jpg
diff --git a/public/potlatch2/help/introduction.mp4 b/vendor/assets/potlatch2/help/introduction.mp4
similarity index 100%
rename from public/potlatch2/help/introduction.mp4
rename to vendor/assets/potlatch2/help/introduction.mp4
diff --git a/public/potlatch2/potlatch2.swf b/vendor/assets/potlatch2/potlatch2.swf
similarity index 100%
rename from public/potlatch2/potlatch2.swf
rename to vendor/assets/potlatch2/potlatch2.swf
diff --git a/public/potlatch2/FontLibrary.swf b/vendor/assets/potlatch2/potlatch2/FontLibrary.swf
similarity index 100%
rename from public/potlatch2/FontLibrary.swf
rename to vendor/assets/potlatch2/potlatch2/FontLibrary.swf
diff --git a/vendor/assets/potlatch2/potlatch2/assets.zip b/vendor/assets/potlatch2/potlatch2/assets.zip
new file mode 100644
index 000000000..ff923d7b8
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/assets.zip differ
diff --git a/public/potlatch2/locales/ast.swf b/vendor/assets/potlatch2/potlatch2/locales/ast.swf
similarity index 100%
rename from public/potlatch2/locales/ast.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ast.swf
diff --git a/public/potlatch2/locales/br.swf b/vendor/assets/potlatch2/potlatch2/locales/br.swf
similarity index 100%
rename from public/potlatch2/locales/br.swf
rename to vendor/assets/potlatch2/potlatch2/locales/br.swf
diff --git a/public/potlatch2/locales/ca.swf b/vendor/assets/potlatch2/potlatch2/locales/ca.swf
similarity index 100%
rename from public/potlatch2/locales/ca.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ca.swf
diff --git a/public/potlatch2/locales/de_DE.swf b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf
similarity index 100%
rename from public/potlatch2/locales/de_DE.swf
rename to vendor/assets/potlatch2/potlatch2/locales/de_DE.swf
diff --git a/public/potlatch2/locales/en_GB.swf b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf
similarity index 100%
rename from public/potlatch2/locales/en_GB.swf
rename to vendor/assets/potlatch2/potlatch2/locales/en_GB.swf
diff --git a/public/potlatch2/locales/en_US.swf b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf
similarity index 100%
rename from public/potlatch2/locales/en_US.swf
rename to vendor/assets/potlatch2/potlatch2/locales/en_US.swf
diff --git a/public/potlatch2/locales/es_ES.swf b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf
similarity index 100%
rename from public/potlatch2/locales/es_ES.swf
rename to vendor/assets/potlatch2/potlatch2/locales/es_ES.swf
diff --git a/public/potlatch2/locales/fa.swf b/vendor/assets/potlatch2/potlatch2/locales/fa.swf
similarity index 100%
rename from public/potlatch2/locales/fa.swf
rename to vendor/assets/potlatch2/potlatch2/locales/fa.swf
diff --git a/public/potlatch2/locales/fi.swf b/vendor/assets/potlatch2/potlatch2/locales/fi.swf
similarity index 100%
rename from public/potlatch2/locales/fi.swf
rename to vendor/assets/potlatch2/potlatch2/locales/fi.swf
diff --git a/public/potlatch2/locales/fr_FR.swf b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf
similarity index 100%
rename from public/potlatch2/locales/fr_FR.swf
rename to vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf
diff --git a/public/potlatch2/locales/ga.swf b/vendor/assets/potlatch2/potlatch2/locales/ga.swf
similarity index 100%
rename from public/potlatch2/locales/ga.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ga.swf
diff --git a/public/potlatch2/locales/gl.swf b/vendor/assets/potlatch2/potlatch2/locales/gl.swf
similarity index 100%
rename from public/potlatch2/locales/gl.swf
rename to vendor/assets/potlatch2/potlatch2/locales/gl.swf
diff --git a/public/potlatch2/locales/he.swf b/vendor/assets/potlatch2/potlatch2/locales/he.swf
similarity index 100%
rename from public/potlatch2/locales/he.swf
rename to vendor/assets/potlatch2/potlatch2/locales/he.swf
diff --git a/public/potlatch2/locales/hsb.swf b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf
similarity index 100%
rename from public/potlatch2/locales/hsb.swf
rename to vendor/assets/potlatch2/potlatch2/locales/hsb.swf
diff --git a/public/potlatch2/locales/hu.swf b/vendor/assets/potlatch2/potlatch2/locales/hu.swf
similarity index 100%
rename from public/potlatch2/locales/hu.swf
rename to vendor/assets/potlatch2/potlatch2/locales/hu.swf
diff --git a/public/potlatch2/locales/ia.swf b/vendor/assets/potlatch2/potlatch2/locales/ia.swf
similarity index 100%
rename from public/potlatch2/locales/ia.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ia.swf
diff --git a/public/potlatch2/locales/ja_JP.swf b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf
similarity index 100%
rename from public/potlatch2/locales/ja_JP.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf
diff --git a/public/potlatch2/locales/ka.swf b/vendor/assets/potlatch2/potlatch2/locales/ka.swf
similarity index 100%
rename from public/potlatch2/locales/ka.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ka.swf
diff --git a/public/potlatch2/locales/lb.swf b/vendor/assets/potlatch2/potlatch2/locales/lb.swf
similarity index 100%
rename from public/potlatch2/locales/lb.swf
rename to vendor/assets/potlatch2/potlatch2/locales/lb.swf
diff --git a/public/potlatch2/locales/mk.swf b/vendor/assets/potlatch2/potlatch2/locales/mk.swf
similarity index 100%
rename from public/potlatch2/locales/mk.swf
rename to vendor/assets/potlatch2/potlatch2/locales/mk.swf
diff --git a/public/potlatch2/locales/ms.swf b/vendor/assets/potlatch2/potlatch2/locales/ms.swf
similarity index 100%
rename from public/potlatch2/locales/ms.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ms.swf
diff --git a/public/potlatch2/locales/nb_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf
similarity index 100%
rename from public/potlatch2/locales/nb_NO.swf
rename to vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf
diff --git a/public/potlatch2/locales/nl_NL.swf b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf
similarity index 100%
rename from public/potlatch2/locales/nl_NL.swf
rename to vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf
diff --git a/public/potlatch2/locales/nn_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf
similarity index 100%
rename from public/potlatch2/locales/nn_NO.swf
rename to vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf
diff --git a/public/potlatch2/locales/pl_PL.swf b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf
similarity index 100%
rename from public/potlatch2/locales/pl_PL.swf
rename to vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf
diff --git a/public/potlatch2/locales/ru.swf b/vendor/assets/potlatch2/potlatch2/locales/ru.swf
similarity index 100%
rename from public/potlatch2/locales/ru.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ru.swf
diff --git a/public/potlatch2/locales/sq.swf b/vendor/assets/potlatch2/potlatch2/locales/sq.swf
similarity index 100%
rename from public/potlatch2/locales/sq.swf
rename to vendor/assets/potlatch2/potlatch2/locales/sq.swf
diff --git a/public/potlatch2/locales/ta.swf b/vendor/assets/potlatch2/potlatch2/locales/ta.swf
similarity index 100%
rename from public/potlatch2/locales/ta.swf
rename to vendor/assets/potlatch2/potlatch2/locales/ta.swf
diff --git a/public/potlatch2/locales/tr.swf b/vendor/assets/potlatch2/potlatch2/locales/tr.swf
similarity index 100%
rename from public/potlatch2/locales/tr.swf
rename to vendor/assets/potlatch2/potlatch2/locales/tr.swf
diff --git a/public/potlatch2/locales/uk.swf b/vendor/assets/potlatch2/potlatch2/locales/uk.swf
similarity index 100%
rename from public/potlatch2/locales/uk.swf
rename to vendor/assets/potlatch2/potlatch2/locales/uk.swf
diff --git a/public/potlatch2/locales/vi_VN.swf b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf
similarity index 100%
rename from public/potlatch2/locales/vi_VN.swf
rename to vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf
diff --git a/public/potlatch2/locales/zh_CN.swf b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf
similarity index 100%
rename from public/potlatch2/locales/zh_CN.swf
rename to vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf