diff --git a/landcover.mss b/landcover.mss
@@ -478,7 +478,7 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'natural_heath'][zoom >= 10] {
+  [feature = 'natural_heath'][zoom >= 8] {
     polygon-fill: @heath;
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
@@ -522,7 +522,8 @@
   [feature = 'amenity_school'],
   [feature = 'amenity_kindergarten'],
   [feature = 'amenity_community_centre'],
-  [feature = 'amenity_social_facility'] {
+  [feature = 'amenity_social_facility'],
+  [feature = 'amenity_arts_centre'] {
     [zoom >= 10] {
       polygon-fill: @residential;
       [zoom >= 12] {

diff --git a/project.mml b/project.mml
diff --git a/roads.mss b/roads.mss
@@ -2449,30 +2449,36 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
       text-face-name: @book-fonts;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-min-distance: 2;
+      text-margin: 3; // 0.3 em
       text-wrap-width: 30;
       text-placement: interior;
       [way_pixels > 250] {
         text-size: 11;
+        text-margin: 3.3; // 0.3 em
         text-wrap-width: 33; // 3 em
         text-line-spacing: -1.35; // -0.15 em
+        text-halo-radius: @standard-halo-radius * 1.1;
       }
       [way_pixels > 1000] {
         text-size: 12;
+        text-margin: 3.6; // 0.3 em
         text-wrap-width: 36; // 3 em
         text-line-spacing: -1.65; // -0.15 em
-        text-halo-radius: @standard-halo-radius * 1.5;
+        text-halo-radius: @standard-halo-radius * 1.2;
       }
       [way_pixels > 4000] {
         text-size: 13;
+        text-margin: 3.9; // 0.3 em
         text-wrap-width: 39; // 3 em
         text-line-spacing: -1.80; // -0.15 em
+        text-halo-radius: @standard-halo-radius * 1.3;
       }
       [way_pixels > 16000] {
         text-size: 14;
+        text-margin: 4.2; // 0.3 em
         text-wrap-width: 42; // 3 em
         text-line-spacing: -1.95; // -0.15 em
-        text-halo-radius: 2;
+        text-halo-radius: @standard-halo-radius * 1.4;
       }
     }
   }

diff --git a/symbols/apartment.svg b/symbols/apartment.svg
diff --git a/symbols/corners.svg b/symbols/corners.svg
diff --git a/symbols/firepit.svg b/symbols/firepit.svg
diff --git a/symbols/rect.svg b/symbols/rect.svg
diff --git a/symbols/rectdiag.svg b/symbols/rectdiag.svg
diff --git a/water.mss b/water.mss
@@ -69,7 +69,7 @@
         [waterway = 'stream'][zoom >= 15] {
           line-width: 3.5;
         }
-        [intermittent = 'yes'] {
+        [int_intermittent = 'yes'] {
           line-dasharray: 4,3;
           line-cap: butt;
           line-join: round;
@@ -82,7 +82,7 @@
 
 #water-lines-low-zoom {
   [waterway = 'river'][zoom >= 8][zoom < 12] {
-    [intermittent = 'yes'] {
+    [int_intermittent = 'yes'] {
       line-dasharray: 8,4;
       line-cap: butt;
       line-join: round;
@@ -123,7 +123,7 @@
     water/line-cap: round;
     water/line-join: round;
 
-    [intermittent = 'yes'],
+    [int_intermittent = 'yes'],
     [waterway = 'wadi'] {
       [bridge = 'yes'][zoom >= 14] {
         bridgefill/line-color: white;
@@ -191,7 +191,7 @@
         }
       }
 
-      [intermittent = 'yes'] {
+      [int_intermittent = 'yes'] {
         water/line-dasharray: 4,3;
         water/line-cap: butt;
         water/line-join: round;