diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index dc7951b167..66735adc91 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 02fe66c85e..cd895c1e2f 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3760,6 +3760,15 @@ cont {
       name: "school"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 12
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15000
+    }
     area {
       color: 0xFFEEDD
       priority: -16045
@@ -3771,6 +3780,15 @@ cont {
       name: "school"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 12
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15000
+    }
     area {
       color: 0xFFEEDD
       priority: -16046
@@ -3782,6 +3800,15 @@ cont {
       name: "school"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 12
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15000
+    }
     area {
       color: 0xFFEEDD
       priority: -16047
@@ -3822,6 +3849,7 @@ cont {
         height: 12
         color: 0x444444
         stroke_color: 0xFFFFFF
+        offset_y: 10
       }
       priority: 15000
     }
@@ -3837,6 +3865,7 @@ cont {
         height: 12
         color: 0x444444
         stroke_color: 0xFFFFFF
+        offset_y: 10
       }
       priority: 15000
     }
@@ -3852,6 +3881,7 @@ cont {
         height: 12
         color: 0x444444
         stroke_color: 0xFFFFFF
+        offset_y: 10
       }
       priority: 15000
     }
@@ -29492,6 +29522,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29506,6 +29537,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29520,6 +29552,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29534,6 +29567,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29600,6 +29634,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29614,6 +29649,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29628,6 +29664,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29642,6 +29679,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29820,6 +29858,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29834,6 +29873,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29848,6 +29888,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
@@ -29862,6 +29903,7 @@ cont {
       primary {
         height: 16
         color: 0x222222
+        stroke_color: 0xFFFFFF
       }
       priority: 16000
     }
diff --git a/data/normal.mapcss b/data/normal.mapcss
index 58a64590f5..e18b11d215 100644
--- a/data/normal.mapcss
+++ b/data/normal.mapcss
@@ -1680,21 +1680,32 @@ line|z13[aeroway=taxiway]
   casing-color:	#202020;
 }
 area|z17-[amenity=shelter],
+area|z17-[amenity=school],
+node|z17-[amenity=shelter],
+node|z17-[amenity=school]
+{
+  text-offset: 10;
+  font-size:	12;
+  text-halo-radius:	2;
+  text:	name;
+  text-color:	#404040;
+  text-halo-color:	white;
+}
+
+area|z16-[landuse=forest],
+area|z17-[tourism=zoo],
 area|z16-[amenity=townhall],
-area|z16-[landuse=forest][wood=deciduous],
+area|z17-[tourism=caravan_site],
 area|z17-[leisure=garden],
-area|z17-[leisure=park]
+area|z17-[leisure=park],
 area|z17-[leisure=sports_centre],
 area|z17-[leisure=stadium],
-area|z17-[tourism=caravan_site],
-area|z17-[tourism=zoo],
-node|z17-[amenity=shelter],
-node|z16-[amenity=townhall],
-node|z17-[leisure=sports_centre],
+node|z13-[highway=motorway_junction],
 node|z17-[leisure=stadium],
 node|z17-[tourism=caravan_site],
 node|z17-[tourism=zoo],
-node|z13-[highway=motorway_junction]
+node|z16-[amenity=townhall],
+node|z17-[leisure=sports_centre]
 {
   font-size:	12;
   text-halo-radius:	2;
@@ -1702,6 +1713,7 @@ node|z13-[highway=motorway_junction]
   text-color:	#404040;
   text-halo-color:	white;
 }
+
 area|z17-[leisure=garden]::int_name,
 area|z17-[leisure=park]::int_name
 {