diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/README.md openstreetmap-mapnik-carto-stylesheet-data-2.6.0/README.md
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/README.md	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/README.md	2013-11-14 21:21:35.000000000 +0000
@@ -66,7 +66,8 @@
 * [PostgreSQL](http://www.postgresql.org/)
 * [PostGIS](http://postgis.org/)
 * [ogr2ogr](http://www.gdal.org/) command line GDAL utility for processing vector data. here we use it to work around a encoding bug in the Nautral Earth data.
-* curl and unzip for downloading and decompressing files
+* curl, unzip for downloading and decompressing files
+* shapeindex (a companion utility to Mapnik found in the mapnik-utils package) for indexing downloaded shapefiles
 
 # Roadmap
 
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/amenity-points.mss openstreetmap-mapnik-carto-stylesheet-data-2.6.0/amenity-points.mss
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/amenity-points.mss	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/amenity-points.mss	2013-11-14 21:21:35.000000000 +0000
@@ -75,7 +75,7 @@
     point-placement: interior;
   }
 
-  [amenity = 'chalet'][zoom >= 17]::amenity {
+  [tourism = 'chalet'][zoom >= 17]::tourism {
     point-file: url('symbols/chalet.p.16.png');
     point-placement: interior;
   }
@@ -575,6 +575,7 @@
     text-halo-radius: 1;
     text-wrap-width: 20;
     text-placement: interior;
+    text-dy: 6;
   }
 
   [tourism = 'alpine_hut'][zoom >= 15]::tourism {
@@ -624,6 +625,7 @@
   }
 
   [tourism = 'hotel']::tourism,
+  [tourism = 'motel']::tourism,
   [tourism = 'hostel']::tourism,
   [tourism = 'chalet']::tourism {
     [zoom >= 17] {
@@ -856,7 +858,7 @@
     [zoom >= 17] {
       text-name: "[name]";
       text-size: 8;
-      text-dy: 9;
+      text-dy: 10;
       text-fill: #939;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/debian/changelog openstreetmap-mapnik-carto-stylesheet-data-2.6.0/debian/changelog
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/debian/changelog	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/debian/changelog	2013-11-14 21:21:36.000000000 +0000
@@ -1,5 +1,12 @@
+openstreetmap-mapnik-carto-stylesheet-data (2.6.0-1~saucy1) saucy; urgency=low
+
+   * Fix missing dependency on curl
+   * update stylesheet to version 2.6.0
+
+ -- Kai Krueger <kakrueger@gmail.com>  Thu, 14 Nov 2013 11:00:00 +0000
+
 openstreetmap-mapnik-carto-stylesheet-data (2.5.0-1~saucy3) saucy; urgency=low
 
    * initial package of the carto based openstreetmap stylesheet
 
- -- Kai Krueger <kakrueger@gmail.com>  Tue, 22 Oct 2013 11:00:00 +0000
+ -- Kai Krueger <kakrueger@gmail.com>  Sun, 20 Oct 2013 11:00:00 +0000
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/debian/control openstreetmap-mapnik-carto-stylesheet-data-2.6.0/debian/control
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/debian/control	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/debian/control	2013-11-14 21:21:36.000000000 +0000
@@ -7,7 +7,7 @@
 
 Package: openstreetmap-mapnik-carto-stylesheet-data
 Architecture: all
-Depends: ${misc:Depends}, libmapnik(>= 2.1.0), ttf-dejavu, debconf, tar, unzip, wget, bzip2, gdal-bin
+Depends: ${misc:Depends}, libmapnik(>= 2.1.0), ttf-dejavu, debconf, tar, unzip, wget, bzip2, gdal-bin, curl
 Recommends: openstreetmap-postgis-db-setup
 Suggests: libapache2-mod-tile, osm2pgsql
 Description: Provides a stylesheet and costline data for rendering OpenStreetMap with Mapnik
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/osm.xml openstreetmap-mapnik-carto-stylesheet-data-2.6.0/osm.xml
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/osm.xml	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/osm.xml	2013-11-14 21:21:36.000000000 +0000
@@ -88,23 +88,6 @@
     </Datasource>
   </Layer>
 
-<Style name="nepopulated" filter-mode="first">
-  <Rule>
-    <MaxScaleDenominator>100000000</MaxScaleDenominator>
-    <MinScaleDenominator>25000000</MinScaleDenominator>
-    <Filter>([SCALERANK] = 1)</Filter>
-    <TextSymbolizer size="8" fill="#808080" fontset-name="fontset-0" halo-radius="1" dy="2" ><![CDATA[[NAME]]]></TextSymbolizer>
-  </Rule>
-</Style>
-<Layer name="nepopulated"
-  srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    <StyleName>nepopulated</StyleName>
-    <Datasource>
-       <Parameter name="file"><![CDATA[data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp]]></Parameter>
-       <Parameter name="type"><![CDATA[shape]]></Parameter>
-    </Datasource>
-  </Layer>
-
 <Style name="landcover" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>25000</MaxScaleDenominator>
@@ -1348,7 +1331,7 @@
     <LineSymbolizer stroke-width="3" stroke="#f2efe9" />
   </Rule>
   <Rule>
-    <MaxScaleDenominator>400000</MaxScaleDenominator>
+    <MaxScaleDenominator>200000</MaxScaleDenominator>
     <MinScaleDenominator>100000</MinScaleDenominator>
     <Filter>([man_made] = 'pier')</Filter>
     <LineSymbolizer stroke-width="1.5" stroke="#f2efe9" />
@@ -1365,7 +1348,7 @@
     <LineSymbolizer stroke-width="2" stroke="#aaaaaa" />
   </Rule>
   <Rule>
-    <MaxScaleDenominator>400000</MaxScaleDenominator>
+    <MaxScaleDenominator>200000</MaxScaleDenominator>
     <MinScaleDenominator>100000</MinScaleDenominator>
     <Filter>([man_made] = 'groyne')</Filter>
     <LineSymbolizer stroke-width="1" stroke="#aaaaaa" />
@@ -1382,7 +1365,7 @@
     <LineSymbolizer stroke-width="2" stroke="#aaaaaa" />
   </Rule>
   <Rule>
-    <MaxScaleDenominator>400000</MaxScaleDenominator>
+    <MaxScaleDenominator>200000</MaxScaleDenominator>
     <MinScaleDenominator>100000</MinScaleDenominator>
     <Filter>([man_made] = 'breakwater')</Filter>
     <LineSymbolizer stroke-width="1" stroke="#aaaaaa" />
@@ -12298,6 +12281,30 @@
     </Datasource>
   </Layer>
 
+<Style name="nepopulated" filter-mode="first">
+  <Rule>
+    <MaxScaleDenominator>100000000</MaxScaleDenominator>
+    <MinScaleDenominator>25000000</MinScaleDenominator>
+    <Filter>([SCALERANK] = 0)</Filter>
+    <TextSymbolizer size="8" fill="#808080" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[NAME]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    <MaxScaleDenominator>100000000</MaxScaleDenominator>
+    <MinScaleDenominator>25000000</MinScaleDenominator>
+    <Filter>([SCALERANK] = 1)</Filter>
+    <TextSymbolizer size="8" fill="#808080" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[NAME]]]></TextSymbolizer>
+  </Rule>
+</Style>
+<Layer name="nepopulated"
+  srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <StyleName>nepopulated</StyleName>
+    <Datasource>
+       <Parameter name="file"><![CDATA[data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp]]></Parameter>
+       <Parameter name="type"><![CDATA[shape]]></Parameter>
+       <Parameter name="encoding"><![CDATA[windows-1252]]></Parameter>
+    </Datasource>
+  </Layer>
+
 <Style name="placenames-large" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>6500000</MaxScaleDenominator>
@@ -12370,7 +12377,7 @@
        <Parameter name="type"><![CDATA[postgis]]></Parameter>
        <Parameter name="table"><![CDATA[(select way,place,name,ref
        from planet_osm_point
-       where place in ('city','metropolis','town') and capital='yes'
+       where place in ('city','town') and capital='yes'
       ) as placenames]]></Parameter>
        <Parameter name="extent"><![CDATA[-20037508,-19929239,20037508,19929239]]></Parameter>
        <Parameter name="key_field"><![CDATA[]]></Parameter>
@@ -12382,40 +12389,6 @@
 <Style name="placenames-medium-town" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
-    <Filter>([place] = 'large_town')</Filter>
-    <TextSymbolizer size="14" fill="#777777" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>400000</MaxScaleDenominator>
-    <MinScaleDenominator>50000</MinScaleDenominator>
-    <Filter>([place] = 'large_town')</Filter>
-    <TextSymbolizer size="10" fill="#000000" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>1500000</MaxScaleDenominator>
-    <MinScaleDenominator>400000</MinScaleDenominator>
-    <Filter>([place] = 'large_town')</Filter>
-    <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>50000</MaxScaleDenominator>
-    <Filter>([place] = 'small_town')</Filter>
-    <TextSymbolizer size="14" fill="#777777" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>400000</MaxScaleDenominator>
-    <MinScaleDenominator>50000</MinScaleDenominator>
-    <Filter>([place] = 'small_town')</Filter>
-    <TextSymbolizer size="10" fill="#000000" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>1500000</MaxScaleDenominator>
-    <MinScaleDenominator>400000</MinScaleDenominator>
-    <Filter>([place] = 'small_town')</Filter>
-    <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>50000</MaxScaleDenominator>
     <Filter>([place] = 'town')</Filter>
     <TextSymbolizer size="14" fill="#777777" fontset-name="fontset-0" halo-radius="1" wrap-width="20" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
@@ -12436,24 +12409,6 @@
   <Rule>
     <MaxScaleDenominator>400000</MaxScaleDenominator>
     <MinScaleDenominator>25000</MinScaleDenominator>
-    <Filter>([place] = 'metropolis')</Filter>
-    <TextSymbolizer size="14" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>1500000</MaxScaleDenominator>
-    <MinScaleDenominator>400000</MinScaleDenominator>
-    <Filter>([place] = 'metropolis')</Filter>
-    <TextSymbolizer size="11" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>12500000</MaxScaleDenominator>
-    <MinScaleDenominator>1500000</MinScaleDenominator>
-    <Filter>([place] = 'metropolis')</Filter>
-    <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>400000</MaxScaleDenominator>
-    <MinScaleDenominator>25000</MinScaleDenominator>
     <Filter>([place] = 'city')</Filter>
     <TextSymbolizer size="14" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
@@ -12478,7 +12433,7 @@
        <Parameter name="type"><![CDATA[postgis]]></Parameter>
        <Parameter name="table"><![CDATA[(select way,place,name
       from planet_osm_point
-      where place in ('city','metropolis','town','large_town','small_town')
+      where place in ('city','town')
         and (capital is null or capital != 'yes')
       ) as placenames]]></Parameter>
        <Parameter name="extent"><![CDATA[-20037508,-19929239,20037508,19929239]]></Parameter>
@@ -12491,46 +12446,46 @@
 <Style name="placenames-small-hamlet" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([place] = 'hamlet')</Filter>
+    <Filter>([place] = 'locality')</Filter>
     <TextSymbolizer size="11" fill="#777777" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
     <MinScaleDenominator>12500</MinScaleDenominator>
-    <Filter>([place] = 'hamlet')</Filter>
+    <Filter>([place] = 'locality')</Filter>
     <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([place] = 'farm')</Filter>
+    <Filter>([place] = 'hamlet')</Filter>
     <TextSymbolizer size="11" fill="#777777" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
     <MinScaleDenominator>12500</MinScaleDenominator>
-    <Filter>([place] = 'farm')</Filter>
+    <Filter>([place] = 'hamlet')</Filter>
     <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([place] = 'isolated_dwelling')</Filter>
+    <Filter>([place] = 'farm')</Filter>
     <TextSymbolizer size="11" fill="#777777" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
     <MinScaleDenominator>12500</MinScaleDenominator>
-    <Filter>([place] = 'isolated_dwelling')</Filter>
+    <Filter>([place] = 'farm')</Filter>
     <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([place] = 'locality')</Filter>
+    <Filter>([place] = 'isolated_dwelling')</Filter>
     <TextSymbolizer size="11" fill="#777777" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
     <MinScaleDenominator>12500</MinScaleDenominator>
-    <Filter>([place] = 'locality')</Filter>
+    <Filter>([place] = 'isolated_dwelling')</Filter>
     <TextSymbolizer size="8" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
@@ -12546,17 +12501,6 @@
     <Filter>([place] = 'village')</Filter>
     <TextSymbolizer size="9" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
-  <Rule>
-    <MaxScaleDenominator>25000</MaxScaleDenominator>
-    <Filter>([place] = 'large_village')</Filter>
-    <TextSymbolizer size="12" fill="#777777" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
-  <Rule>
-    <MaxScaleDenominator>200000</MaxScaleDenominator>
-    <MinScaleDenominator>25000</MinScaleDenominator>
-    <Filter>([place] = 'large_village')</Filter>
-    <TextSymbolizer size="9" fill="#000000" fontset-name="fontset-0" halo-radius="1" ><![CDATA[[name]]]></TextSymbolizer>
-  </Rule>
 </Style>
 <Style name="placenames-small-suburb" filter-mode="first">
   <Rule>
@@ -12580,7 +12524,7 @@
        <Parameter name="type"><![CDATA[postgis]]></Parameter>
        <Parameter name="table"><![CDATA[(select way,place,name
       from planet_osm_point
-      where place in ('suburb','village','large_village','hamlet','locality','isolated_dwelling','farm')
+      where place in ('suburb','village','hamlet','locality','isolated_dwelling','farm')
       ) as placenames]]></Parameter>
        <Parameter name="extent"><![CDATA[-20037508,-19929239,20037508,19929239]]></Parameter>
        <Parameter name="key_field"><![CDATA[]]></Parameter>
@@ -13264,12 +13208,12 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'fashion')</Filter>
+    <Filter>([shop] = 'clothes')</Filter>
     <PointSymbolizer file="symbols/shop_clothes.p.16.png" placement="interior" />
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'clothes')</Filter>
+    <Filter>([shop] = 'fashion')</Filter>
     <PointSymbolizer file="symbols/shop_clothes.p.16.png" placement="interior" />
   </Rule>
   <Rule>
@@ -13312,17 +13256,17 @@
     <PointSymbolizer file="symbols/communications.p.20.png" placement="interior" />
   </Rule>
 </Style>
-<Style name="amenity-points-lock" filter-mode="first">
+<Style name="amenity-points-waterway" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>25000</MaxScaleDenominator>
-    <Filter>([lock] = 'yes')</Filter>
+    <Filter>([waterway] = 'lock')</Filter>
     <PointSymbolizer file="symbols/lock_gate.png" placement="interior" />
   </Rule>
 </Style>
-<Style name="amenity-points-waterway" filter-mode="first">
+<Style name="amenity-points-lock" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>25000</MaxScaleDenominator>
-    <Filter>([waterway] = 'lock')</Filter>
+    <Filter>([lock] = 'yes')</Filter>
     <PointSymbolizer file="symbols/lock_gate.png" placement="interior" />
   </Rule>
 </Style>
@@ -13501,11 +13445,6 @@
     <PointSymbolizer file="symbols/cinema.p.24.png" placement="interior" />
   </Rule>
   <Rule>
-    <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'chalet')</Filter>
-    <PointSymbolizer file="symbols/chalet.p.16.png" placement="interior" />
-  </Rule>
-  <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
     <Filter>([amenity] = 'car_sharing')</Filter>
     <PointSymbolizer file="symbols/car_share.p.16.png" placement="interior" />
@@ -13599,6 +13538,11 @@
     <PointSymbolizer file="symbols/guest_house.p.16.png" placement="interior" />
   </Rule>
   <Rule>
+    <MaxScaleDenominator>5000</MaxScaleDenominator>
+    <Filter>([tourism] = 'chalet')</Filter>
+    <PointSymbolizer file="symbols/chalet.p.16.png" placement="interior" />
+  </Rule>
+  <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
     <Filter>([tourism] = 'caravan_site')</Filter>
     <PointSymbolizer file="symbols/caravan_park.p.24.png" placement="interior" />
@@ -13619,8 +13563,8 @@
     <StyleName>amenity-points-tourism</StyleName>
     <StyleName>amenity-points-amenity</StyleName>
     <StyleName>amenity-points-highway</StyleName>
-    <StyleName>amenity-points-waterway</StyleName>
     <StyleName>amenity-points-lock</StyleName>
+    <StyleName>amenity-points-waterway</StyleName>
     <StyleName>amenity-points-man_made</StyleName>
     <StyleName>amenity-points-historic</StyleName>
     <StyleName>amenity-points-shop</StyleName>
@@ -13701,12 +13645,12 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'fashion')</Filter>
+    <Filter>([shop] = 'clothes')</Filter>
     <PointSymbolizer file="symbols/shop_clothes.p.16.png" placement="interior" />
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'clothes')</Filter>
+    <Filter>([shop] = 'fashion')</Filter>
     <PointSymbolizer file="symbols/shop_clothes.p.16.png" placement="interior" />
   </Rule>
   <Rule>
@@ -13749,17 +13693,17 @@
     <PointSymbolizer file="symbols/communications.p.20.png" placement="interior" />
   </Rule>
 </Style>
-<Style name="amenity-points-poly-lock" filter-mode="first">
+<Style name="amenity-points-poly-waterway" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>25000</MaxScaleDenominator>
-    <Filter>([lock] = 'yes')</Filter>
+    <Filter>([waterway] = 'lock')</Filter>
     <PointSymbolizer file="symbols/lock_gate.png" placement="interior" />
   </Rule>
 </Style>
-<Style name="amenity-points-poly-waterway" filter-mode="first">
+<Style name="amenity-points-poly-lock" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>25000</MaxScaleDenominator>
-    <Filter>([waterway] = 'lock')</Filter>
+    <Filter>([lock] = 'yes')</Filter>
     <PointSymbolizer file="symbols/lock_gate.png" placement="interior" />
   </Rule>
 </Style>
@@ -13938,11 +13882,6 @@
     <PointSymbolizer file="symbols/cinema.p.24.png" placement="interior" />
   </Rule>
   <Rule>
-    <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'chalet')</Filter>
-    <PointSymbolizer file="symbols/chalet.p.16.png" placement="interior" />
-  </Rule>
-  <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
     <Filter>([amenity] = 'car_sharing')</Filter>
     <PointSymbolizer file="symbols/car_share.p.16.png" placement="interior" />
@@ -14036,6 +13975,11 @@
     <PointSymbolizer file="symbols/guest_house.p.16.png" placement="interior" />
   </Rule>
   <Rule>
+    <MaxScaleDenominator>5000</MaxScaleDenominator>
+    <Filter>([tourism] = 'chalet')</Filter>
+    <PointSymbolizer file="symbols/chalet.p.16.png" placement="interior" />
+  </Rule>
+  <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
     <Filter>([tourism] = 'caravan_site')</Filter>
     <PointSymbolizer file="symbols/caravan_park.p.24.png" placement="interior" />
@@ -14056,8 +14000,8 @@
     <StyleName>amenity-points-poly-tourism</StyleName>
     <StyleName>amenity-points-poly-amenity</StyleName>
     <StyleName>amenity-points-poly-highway</StyleName>
-    <StyleName>amenity-points-poly-waterway</StyleName>
     <StyleName>amenity-points-poly-lock</StyleName>
+    <StyleName>amenity-points-poly-waterway</StyleName>
     <StyleName>amenity-points-poly-man_made</StyleName>
     <StyleName>amenity-points-poly-historic</StyleName>
     <StyleName>amenity-points-poly-shop</StyleName>
@@ -14460,68 +14404,68 @@
 <Style name="text-shop" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([shop] = 'supermarket')</Filter>
+    <Filter>([shop] = 'department_store')</Filter>
     <TextSymbolizer size="9" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([shop] = 'department_store')</Filter>
+    <Filter>([shop] = 'supermarket')</Filter>
     <TextSymbolizer size="9" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'doityourself')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'hairdresser')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'hairdresser')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'doityourself')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'butcher')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'convenience')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'car')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'fashion')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'bakery')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'car_repair')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'clothes')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'car')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'fashion')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'bicycle')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'car_repair')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'bakery')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'bicycle')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'clothes')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'florist')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'butcher')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'convenience')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'florist')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
 <Style name="text-man_made" filter-mode="first">
@@ -14612,6 +14556,11 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
+    <Filter>([tourism] = 'hotel')</Filter>
+    <TextSymbolizer size="10" fill="#0066ff" dy="11" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    <MaxScaleDenominator>5000</MaxScaleDenominator>
     <Filter>([tourism] = 'hostel')</Filter>
     <TextSymbolizer size="10" fill="#0066ff" dy="11" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
@@ -14622,7 +14571,7 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([tourism] = 'hotel')</Filter>
+    <Filter>([tourism] = 'motel')</Filter>
     <TextSymbolizer size="10" fill="#0066ff" dy="11" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
@@ -14665,20 +14614,20 @@
 <Style name="text-natural" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'peak') and ([name] != '')</Filter>
+    <Filter>([natural] = 'volcano') and ([name] != '')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer dy="18" size="9" fill="#a52a2a" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'volcano') and ([name] != '')</Filter>
+    <Filter>([natural] = 'peak') and ([name] != '')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer dy="18" size="9" fill="#a52a2a" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
     <Filter>([natural] = 'spring')</Filter>
-    <TextSymbolizer size="10" fill="#6699cc" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <TextSymbolizer size="10" fill="#6699cc" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" dy="6" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
@@ -14702,13 +14651,13 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'volcano')</Filter>
+    <Filter>([natural] = 'peak')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer size="9" fill="#a52a2a" dy="6" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'peak')</Filter>
+    <Filter>([natural] = 'volcano')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer size="9" fill="#a52a2a" dy="6" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
@@ -14812,17 +14761,17 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'library')</Filter>
+    <Filter>([amenity] = 'courthouse')</Filter>
     <TextSymbolizer size="10" fill="#734a08" dy="12" fontset-name="fontset-2" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'courthouse')</Filter>
+    <Filter>([amenity] = 'theatre')</Filter>
     <TextSymbolizer size="10" fill="#734a08" dy="12" fontset-name="fontset-2" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'theatre')</Filter>
+    <Filter>([amenity] = 'library')</Filter>
     <TextSymbolizer size="10" fill="#734a08" dy="12" fontset-name="fontset-2" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
@@ -14832,12 +14781,12 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'pub')</Filter>
+    <Filter>([amenity] = 'biergarten')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'restaurant')</Filter>
+    <Filter>([amenity] = 'fast_food')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
@@ -14847,12 +14796,12 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'fast_food')</Filter>
+    <Filter>([amenity] = 'pub')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'biergarten')</Filter>
+    <Filter>([amenity] = 'restaurant')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
@@ -14919,68 +14868,68 @@
 <Style name="text-poly-shop" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([shop] = 'supermarket')</Filter>
+    <Filter>([shop] = 'department_store')</Filter>
     <TextSymbolizer size="9" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
-    <Filter>([shop] = 'department_store')</Filter>
+    <Filter>([shop] = 'supermarket')</Filter>
     <TextSymbolizer size="9" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'doityourself')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'hairdresser')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'hairdresser')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'doityourself')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'butcher')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'convenience')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'car')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'fashion')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'bakery')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'car_repair')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'clothes')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'car')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'fashion')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'bicycle')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'car_repair')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'bakery')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'bicycle')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'clothes')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'florist')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'butcher')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([shop] = 'convenience')</Filter>
-    <TextSymbolizer size="8" dy="9" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <Filter>([shop] = 'florist')</Filter>
+    <TextSymbolizer size="8" dy="10" fill="#993399" fontset-name="fontset-0" halo-radius="1" wrap-width="12" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
 <Style name="text-poly-man_made" filter-mode="first">
@@ -15071,6 +15020,11 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
+    <Filter>([tourism] = 'hotel')</Filter>
+    <TextSymbolizer size="10" fill="#0066ff" dy="11" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    <MaxScaleDenominator>5000</MaxScaleDenominator>
     <Filter>([tourism] = 'hostel')</Filter>
     <TextSymbolizer size="10" fill="#0066ff" dy="11" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
@@ -15081,7 +15035,7 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([tourism] = 'hotel')</Filter>
+    <Filter>([tourism] = 'motel')</Filter>
     <TextSymbolizer size="10" fill="#0066ff" dy="11" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
@@ -15124,20 +15078,20 @@
 <Style name="text-poly-natural" filter-mode="first">
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'peak') and ([name] != '')</Filter>
+    <Filter>([natural] = 'volcano') and ([name] != '')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer dy="18" size="9" fill="#a52a2a" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'volcano') and ([name] != '')</Filter>
+    <Filter>([natural] = 'peak') and ([name] != '')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer dy="18" size="9" fill="#a52a2a" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>12500</MaxScaleDenominator>
     <Filter>([natural] = 'spring')</Filter>
-    <TextSymbolizer size="10" fill="#6699cc" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
+    <TextSymbolizer size="10" fill="#6699cc" fontset-name="fontset-0" halo-radius="1" wrap-width="20" placement="interior" dy="6" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>50000</MaxScaleDenominator>
@@ -15161,13 +15115,13 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'volcano')</Filter>
+    <Filter>([natural] = 'peak')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer size="9" fill="#a52a2a" dy="6" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>100000</MaxScaleDenominator>
-    <Filter>([natural] = 'peak')</Filter>
+    <Filter>([natural] = 'volcano')</Filter>
     <TextSymbolizer size="10" fill="#a52a2a" dy="5" fontset-name="fontset-0" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
     <TextSymbolizer size="9" fill="#a52a2a" dy="6" fontset-name="fontset-1" halo-radius="1" placement="interior" ><![CDATA[[ele]]]></TextSymbolizer>
   </Rule>
@@ -15271,17 +15225,17 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'library')</Filter>
+    <Filter>([amenity] = 'courthouse')</Filter>
     <TextSymbolizer size="10" fill="#734a08" dy="12" fontset-name="fontset-2" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'courthouse')</Filter>
+    <Filter>([amenity] = 'theatre')</Filter>
     <TextSymbolizer size="10" fill="#734a08" dy="12" fontset-name="fontset-2" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'theatre')</Filter>
+    <Filter>([amenity] = 'library')</Filter>
     <TextSymbolizer size="10" fill="#734a08" dy="12" fontset-name="fontset-2" halo-radius="1" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
@@ -15291,12 +15245,12 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'pub')</Filter>
+    <Filter>([amenity] = 'biergarten')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'restaurant')</Filter>
+    <Filter>([amenity] = 'fast_food')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
@@ -15306,12 +15260,12 @@
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'fast_food')</Filter>
+    <Filter>([amenity] = 'pub')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
   <Rule>
     <MaxScaleDenominator>5000</MaxScaleDenominator>
-    <Filter>([amenity] = 'biergarten')</Filter>
+    <Filter>([amenity] = 'restaurant')</Filter>
     <TextSymbolizer fill="#734a08" size="10" dy="9" fontset-name="fontset-2" halo-radius="1" wrap-width="34" placement="interior" ><![CDATA[[name]]]></TextSymbolizer>
   </Rule>
 </Style>
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/placenames.mss openstreetmap-mapnik-carto-stylesheet-data-2.6.0/placenames.mss
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/placenames.mss	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/placenames.mss	2013-11-14 21:21:35.000000000 +0000
@@ -57,8 +57,7 @@
 }
 
 #placenames-medium::city {
-  [place = 'city'],
-  [place = 'metropolis'] {
+  [place = 'city'] {
     [zoom >= 6][zoom < 15] {
       text-name: "[name]";
       text-size: 8;
@@ -76,9 +75,7 @@
 }
 
 #placenames-medium::town {
-  [place = 'town'],
-  [place = 'large_town'],
-  [place = 'small_town'] {
+  [place = 'town'] {
     [zoom >= 9] {
       text-name: "[name]";
       text-size: 8;
@@ -112,8 +109,7 @@
 }
 
 #placenames-small::village {
-  [place = 'village'],
-  [place = 'large_village'] {
+  [place = 'village'] {
     [zoom >=12] {
       text-name: "[name]";
       text-size: 9;
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/project.mml openstreetmap-mapnik-carto-stylesheet-data-2.6.0/project.mml
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/project.mml	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/project.mml	2013-11-14 21:21:35.000000000 +0000
@@ -112,25 +112,6 @@
       "name": "necountries"
     },
     {
-      "geometry": "point",
-      "extent": [
-        -179.58997888396897,
-        -85.051,
-        179.38330358817018,
-        82.48332318035943
-      ],
-      "id": "nepopulated",
-      "class": "",
-      "Datasource": {
-        "file": "data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp",
-        "type": "shape"
-      },
-      "srs-name": "WGS84",
-      "srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
-      "advanced": {},
-      "name": "nepopulated"
-    },
-    {
       "extent": [
         -179.99999692067183,
         -84.96651228427099,
@@ -1568,6 +1549,28 @@
     {
       "geometry": "point",
       "extent": [
+        -179.58997888396897,
+        -85.051,
+        179.38330358817018,
+        82.48332318035943
+      ],
+      "id": "nepopulated",
+      "class": "",
+      "Datasource": {
+        "file": "data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp",
+        "type": "shape",
+        "encoding": "windows-1252"
+      },
+      "srs-name": "WGS84",
+      "srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
+      "advanced": {
+        "encoding": "windows-1252"
+      },
+      "name": "nepopulated"
+    },
+    {
+      "geometry": "point",
+      "extent": [
         -179.99999692067183,
         -84.96651228427099,
         179.99999692067183,
@@ -1598,7 +1601,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "(select way,place,name,ref\n       from planet_osm_point\n       where place in ('city','metropolis','town') and capital='yes'\n      ) as placenames",
+        "table": "(select way,place,name,ref\n       from planet_osm_point\n       where place in ('city','town') and capital='yes'\n      ) as placenames",
         "extent": "-20037508,-19929239,20037508,19929239",
         "key_field": "",
         "geometry_field": "way",
@@ -1621,7 +1624,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "(select way,place,name\n      from planet_osm_point\n      where place in ('city','metropolis','town','large_town','small_town')\n        and (capital is null or capital != 'yes')\n      ) as placenames",
+        "table": "(select way,place,name\n      from planet_osm_point\n      where place in ('city','town')\n        and (capital is null or capital != 'yes')\n      ) as placenames",
         "extent": "-20037508,-19929239,20037508,19929239",
         "key_field": "",
         "geometry_field": "way",
@@ -1644,7 +1647,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "(select way,place,name\n      from planet_osm_point\n      where place in ('suburb','village','large_village','hamlet','locality','isolated_dwelling','farm')\n      ) as placenames",
+        "table": "(select way,place,name\n      from planet_osm_point\n      where place in ('suburb','village','hamlet','locality','isolated_dwelling','farm')\n      ) as placenames",
         "extent": "-20037508,-19929239,20037508,19929239",
         "key_field": "",
         "geometry_field": "way",
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/shapefiles.mss openstreetmap-mapnik-carto-stylesheet-data-2.6.0/shapefiles.mss
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/shapefiles.mss	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/shapefiles.mss	2013-11-14 21:21:35.000000000 +0000
@@ -6,13 +6,15 @@
 }
 
 #nepopulated {
-  [SCALERANK = 1][zoom >= 3][zoom < 5] {
-    text-name: "[NAME]";
-    text-size: 8;
-    text-fill: grey;
-    text-face-name: @book-fonts;
-    text-halo-radius: 1;
-    text-dy: 2;
+  [zoom >= 3][zoom < 5] {
+    [SCALERANK = 0],
+    [SCALERANK = 1] {
+      text-name: "[NAME]";
+      text-size: 8;
+      text-fill: grey;
+      text-face-name: @book-fonts;
+      text-halo-radius: 1;
+    }
   }
 }
 
diff -Nru openstreetmap-mapnik-carto-stylesheet-data-2.5.0/water-features.mss openstreetmap-mapnik-carto-stylesheet-data-2.6.0/water-features.mss
--- openstreetmap-mapnik-carto-stylesheet-data-2.5.0/water-features.mss	2013-10-22 23:23:32.000000000 +0000
+++ openstreetmap-mapnik-carto-stylesheet-data-2.6.0/water-features.mss	2013-11-14 21:21:35.000000000 +0000
@@ -35,7 +35,7 @@
 #piers {
   [man_made = 'breakwater'],
   [man_made = 'groyne'] {
-    [zoom >= 11] {
+    [zoom >= 12] {
       line-width: 1;
       line-color: #aaa;
     }
@@ -46,7 +46,7 @@
       line-width: 4;
     }
   }
-  [man_made = 'pier'][zoom >= 11] {
+  [man_made = 'pier'][zoom >= 12] {
     line-width: 1.5;
     line-color: @land-color;
     [zoom >= 13] { line-width: 3; }