diff --git a/data/colors.txt b/data/colors.txt
index 90df90b49f..c23ee6f707 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -282,5 +282,13 @@
 3019359744
 3019863808
 3019898879
+3423803648
+3423869952
+3433742181
+3434005099
+3434136176
+3434333297
+3434924158
+3435581331
 4281018407
 4294506744
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index cdf09c3a4d..dcdca63d19 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 6ab2affeca..c48dee6951 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3595,7 +3595,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "childcare-l"
+      name: "kindergarten-l"
       priority: 16824
     }
     caption {
@@ -3996,7 +3996,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -4011,7 +4011,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -4026,7 +4026,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -40547,14 +40547,14 @@ cont {
   element {
     scale: 10
     area {
-      color: 13029267
+      color: 3435581331
       priority: -15892
     }
   }
   element {
     scale: 11
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -40566,7 +40566,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -40587,7 +40587,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 11781233
+      color: 3434333297
       priority: -15892
     }
     symbol {
@@ -40608,7 +40608,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 11453035
+      color: 3434005099
       priority: -15892
     }
     symbol {
@@ -40628,7 +40628,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 11584112
+      color: 3434136176
       priority: -15892
     }
     symbol {
@@ -40648,7 +40648,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -40668,7 +40668,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -40688,7 +40688,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -40708,7 +40708,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 348f370141..3e25d867ad 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 4f1c04b1d2..b94a446945 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3274,7 +3274,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "childcare-l"
+      name: "kindergarten-l"
       priority: 16824
     }
     caption {
@@ -3612,7 +3612,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3627,7 +3627,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3642,7 +3642,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -35631,14 +35631,14 @@ cont {
   element {
     scale: 10
     area {
-      color: 13029267
+      color: 3435581331
       priority: -15892
     }
   }
   element {
     scale: 11
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -35650,7 +35650,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -35671,7 +35671,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 11781233
+      color: 3434333297
       priority: -15892
     }
     symbol {
@@ -35692,7 +35692,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 11453035
+      color: 3434005099
       priority: -15892
     }
     symbol {
@@ -35712,7 +35712,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 11584112
+      color: 3434136176
       priority: -15892
     }
     symbol {
@@ -35732,7 +35732,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -35752,7 +35752,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -35772,7 +35772,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -35792,7 +35792,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3fb4d0d4b6..ee78b0a6b6 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 03e8509167..bb4a6a81c5 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3274,7 +3274,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "childcare-l"
+      name: "kindergarten-l"
       priority: 16824
     }
     caption {
@@ -3612,7 +3612,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3627,7 +3627,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3642,7 +3642,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -35631,14 +35631,14 @@ cont {
   element {
     scale: 10
     area {
-      color: 1251584
+      color: 3423803648
       priority: -15892
     }
   }
   element {
     scale: 11
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35650,7 +35650,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35671,7 +35671,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35692,7 +35692,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35712,7 +35712,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35732,7 +35732,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35752,7 +35752,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35772,7 +35772,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35792,7 +35792,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
index 9be7bb1e3b..e16a94f3d8 100644
--- a/data/styles/clear/include/natural.mapcss
+++ b/data/styles/clear/include/natural.mapcss
@@ -233,7 +233,7 @@ line[waterway][tunnel]
 /* VEGETATION */
 
 area|z10[natural=wood],
-area|z10[landuse=forest]]
+area|z10[landuse=forest]
 {
   fill-color: @green1;
 	fill-position: background;