diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f6e6831197..743204734d 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 0d81e71c12..c0023e55b1 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -39043,74 +39043,144 @@ cont {
 }
 cont {
   name: "natural-glacier"
+  element {
+    scale: 0
+    area {
+      color: 16777215
+      priority: -16317
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 16777215
+      priority: -16318
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 16777215
+      priority: -16319
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 16777215
+      priority: -16320
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 16777215
+      priority: -16321
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 16777215
+      priority: -16322
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 16777215
+      priority: -16323
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 16777215
+      priority: -16324
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 16777215
+      priority: -16325
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 16777215
+      priority: -16326
+    }
+  }
   element {
     scale: 10
     area {
-      color: 11197934
-      priority: -16317
+      color: 16777215
+      priority: -16327
     }
   }
   element {
     scale: 11
     area {
-      color: 11197934
-      priority: -16318
+      color: 16777215
+      priority: -16328
     }
   }
   element {
     scale: 12
     area {
-      color: 11197934
-      priority: -16319
+      color: 16777215
+      priority: -16329
     }
   }
   element {
     scale: 13
     area {
-      color: 11197934
-      priority: -16320
+      color: 16777215
+      priority: -16330
     }
   }
   element {
     scale: 14
     area {
-      color: 11197934
-      priority: -16321
+      color: 16777215
+      priority: -16331
     }
   }
   element {
     scale: 15
     area {
-      color: 11197934
-      priority: -16322
+      color: 16777215
+      priority: -16332
     }
   }
   element {
     scale: 16
     area {
-      color: 11197934
-      priority: -16323
+      color: 16777215
+      priority: -16333
     }
   }
   element {
     scale: 17
     area {
-      color: 11197934
-      priority: -16324
+      color: 16777215
+      priority: -16334
     }
   }
   element {
     scale: 18
     area {
-      color: 11197934
-      priority: -16325
+      color: 16777215
+      priority: -16335
     }
   }
   element {
     scale: 19
     area {
-      color: 11197934
-      priority: -16326
+      color: 16777215
+      priority: -16336
     }
   }
 }
@@ -39120,28 +39190,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16327
+      priority: -16337
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16328
+      priority: -16338
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16329
+      priority: -16339
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16330
+      priority: -16340
     }
     caption {
       primary {
@@ -39155,7 +39225,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16331
+      priority: -16341
     }
     caption {
       primary {
@@ -39169,7 +39239,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16332
+      priority: -16342
     }
     caption {
       primary {
@@ -39183,7 +39253,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16333
+      priority: -16343
     }
     caption {
       primary {
@@ -39197,7 +39267,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16334
+      priority: -16344
     }
     caption {
       primary {
@@ -39269,6 +39339,76 @@ cont {
 }
 cont {
   name: "natural-lake"
+  element {
+    scale: 0
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
   element {
     scale: 10
     area {
@@ -39727,6 +39867,76 @@ cont {
 }
 cont {
   name: "natural-pond"
+  element {
+    scale: 0
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
   element {
     scale: 10
     area {
@@ -39993,56 +40203,56 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16335
+      priority: -16345
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16336
+      priority: -16346
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16337
+      priority: -16347
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16338
+      priority: -16348
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16339
+      priority: -16349
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16340
+      priority: -16350
     }
   }
   element {
     scale: 18
     area {
       color: 14544588
-      priority: -16341
+      priority: -16351
     }
   }
   element {
     scale: 19
     area {
       color: 14544588
-      priority: -16342
+      priority: -16352
     }
   }
 }
@@ -40403,6 +40613,76 @@ cont {
 }
 cont {
   name: "natural-water"
+  element {
+    scale: 0
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 12312029
+      priority: -15895
+    }
+  }
   element {
     scale: 10
     area {
@@ -40642,42 +40922,42 @@ cont {
     scale: 14
     area {
       color: 11193531
-      priority: -16343
+      priority: -16353
     }
   }
   element {
     scale: 15
     area {
       color: 11193531
-      priority: -16344
+      priority: -16354
     }
   }
   element {
     scale: 16
     area {
       color: 11193531
-      priority: -16345
+      priority: -16355
     }
   }
   element {
     scale: 17
     area {
       color: 11193531
-      priority: -16346
+      priority: -16356
     }
   }
   element {
     scale: 18
     area {
       color: 11193531
-      priority: -16347
+      priority: -16357
     }
   }
   element {
     scale: 19
     area {
       color: 11193531
-      priority: -16348
+      priority: -16358
     }
   }
 }
@@ -40687,173 +40967,61 @@ cont {
     scale: 12
     area {
       color: 11193531
-      priority: -16349
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 11193531
-      priority: -16350
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 11193531
-      priority: -16351
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 11193531
-      priority: -16352
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 11193531
-      priority: -16353
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 11193531
-      priority: -16354
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 11193531
-      priority: -16355
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 11193531
-      priority: -16356
-    }
-  }
-}
-cont {
-  name: "natural-wood"
-  element {
-    scale: 10
-    area {
-      color: 12311978
-      priority: -16357
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 12311978
-      priority: -16358
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 12311978
       priority: -16359
     }
   }
   element {
     scale: 13
     area {
-      color: 12311978
+      color: 11193531
       priority: -16360
     }
   }
   element {
     scale: 14
     area {
-      color: 12311978
+      color: 11193531
       priority: -16361
     }
   }
   element {
     scale: 15
     area {
-      color: 12311978
+      color: 11193531
       priority: -16362
     }
-    caption {
-      primary {
-        height: 12
-        color: 2236962
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 16
     area {
-      color: 12311978
+      color: 11193531
       priority: -16363
     }
-    caption {
-      primary {
-        height: 16
-        color: 2236962
-        stroke_color: 16777215
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 17
     area {
-      color: 12311978
+      color: 11193531
       priority: -16364
     }
-    caption {
-      primary {
-        height: 16
-        color: 2236962
-        stroke_color: 16777215
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 18
     area {
-      color: 12311978
+      color: 11193531
       priority: -16365
     }
-    caption {
-      primary {
-        height: 16
-        color: 2236962
-        stroke_color: 16777215
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 19
     area {
-      color: 12311978
+      color: 11193531
       priority: -16366
     }
-    caption {
-      primary {
-        height: 16
-        color: 2236962
-        stroke_color: 16777215
-      }
-      priority: 15000
-    }
   }
 }
 cont {
-  name: "natural-wood-coniferous"
+  name: "natural-wood"
   element {
     scale: 10
     area {
@@ -40965,7 +41133,7 @@ cont {
   }
 }
 cont {
-  name: "natural-wood-deciduous"
+  name: "natural-wood-coniferous"
   element {
     scale: 10
     area {
@@ -41077,7 +41245,7 @@ cont {
   }
 }
 cont {
-  name: "natural-wood-mixed"
+  name: "natural-wood-deciduous"
   element {
     scale: 10
     area {
@@ -41188,6 +41356,118 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wood-mixed"
+  element {
+    scale: 10
+    area {
+      color: 12311978
+      priority: -16397
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 12311978
+      priority: -16398
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12311978
+      priority: -16399
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12311978
+      priority: -16400
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12311978
+      priority: -16401
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12311978
+      priority: -16402
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12311978
+      priority: -16403
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        stroke_color: 16777215
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12311978
+      priority: -16404
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        stroke_color: 16777215
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12311978
+      priority: -16405
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        stroke_color: 16777215
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12311978
+      priority: -16406
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        stroke_color: 16777215
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "office"
   element {
@@ -45196,7 +45476,7 @@ cont {
     scale: 14
     area {
       color: 14540236
-      priority: -16397
+      priority: -16407
     }
     caption {
       primary {
@@ -45210,7 +45490,7 @@ cont {
     scale: 15
     area {
       color: 14540236
-      priority: -16398
+      priority: -16408
     }
     caption {
       primary {
@@ -45224,7 +45504,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16399
+      priority: -16409
     }
     caption {
       primary {
@@ -45238,7 +45518,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16400
+      priority: -16410
     }
     caption {
       primary {
@@ -45252,7 +45532,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16401
+      priority: -16411
     }
     caption {
       primary {
@@ -45266,7 +45546,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16402
+      priority: -16412
     }
     caption {
       primary {
@@ -46431,14 +46711,14 @@ cont {
     scale: 11
     area {
       color: 14540236
-      priority: -16403
+      priority: -16413
     }
   }
   element {
     scale: 12
     area {
       color: 14540236
-      priority: -16404
+      priority: -16414
     }
     caption {
       primary {
@@ -46453,7 +46733,7 @@ cont {
     scale: 13
     area {
       color: 14540236
-      priority: -16405
+      priority: -16415
     }
     caption {
       primary {
@@ -46474,7 +46754,7 @@ cont {
     scale: 14
     area {
       color: 14540236
-      priority: -16406
+      priority: -16416
     }
     caption {
       primary {
@@ -46495,7 +46775,7 @@ cont {
     scale: 15
     area {
       color: 14540236
-      priority: -16407
+      priority: -16417
     }
     caption {
       primary {
@@ -46516,7 +46796,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16408
+      priority: -16418
     }
     caption {
       primary {
@@ -46537,7 +46817,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16409
+      priority: -16419
     }
     caption {
       primary {
@@ -46558,7 +46838,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16410
+      priority: -16420
     }
     caption {
       primary {
@@ -46579,7 +46859,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16411
+      priority: -16421
     }
     caption {
       primary {
@@ -61436,21 +61716,21 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16412
+      priority: -16422
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16413
+      priority: -16423
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16414
+      priority: -16424
     }
     symbol {
       name: "campsite"
@@ -61461,7 +61741,7 @@ cont {
     scale: 15
     area {
       color: 13430459
-      priority: -16415
+      priority: -16425
     }
     symbol {
       name: "campsite"
@@ -61472,7 +61752,7 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16416
+      priority: -16426
     }
     symbol {
       name: "campsite"
@@ -61546,35 +61826,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16417
+      priority: -16427
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16418
+      priority: -16428
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16419
+      priority: -16429
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16420
+      priority: -16430
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16421
+      priority: -16431
     }
   }
   element {
@@ -62075,35 +62355,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16422
+      priority: -16432
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16423
+      priority: -16433
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16424
+      priority: -16434
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16425
+      priority: -16435
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16426
+      priority: -16436
     }
   }
   element {
@@ -62238,35 +62518,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16427
+      priority: -16437
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16428
+      priority: -16438
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16429
+      priority: -16439
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16430
+      priority: -16440
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16431
+      priority: -16441
     }
   }
   element {
@@ -62647,6 +62927,76 @@ cont {
 }
 cont {
   name: "waterway-dock"
+  element {
+    scale: 0
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 12312029
+      priority: 1106
+    }
+  }
   element {
     scale: 10
     area {
@@ -63144,6 +63494,76 @@ cont {
 }
 cont {
   name: "waterway-riverbank"
+  element {
+    scale: 0
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 12312029
+      priority: 1028
+    }
+  }
   element {
     scale: 10
     area {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index af573b4377..bb0066f962 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 1511e3a277..95964f2353 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -39044,75 +39044,145 @@ cont {
 cont {
   name: "natural-glacier"
   element {
-    scale: 10
+    scale: 0
     area {
       color: 5579281
       priority: -16317
     }
   }
   element {
-    scale: 11
+    scale: 1
     area {
       color: 5579281
       priority: -16318
     }
   }
   element {
-    scale: 12
+    scale: 2
     area {
       color: 5579281
       priority: -16319
     }
   }
   element {
-    scale: 13
+    scale: 3
     area {
       color: 5579281
       priority: -16320
     }
   }
   element {
-    scale: 14
+    scale: 4
     area {
       color: 5579281
       priority: -16321
     }
   }
   element {
-    scale: 15
+    scale: 5
     area {
       color: 5579281
       priority: -16322
     }
   }
   element {
-    scale: 16
+    scale: 6
     area {
       color: 5579281
       priority: -16323
     }
   }
   element {
-    scale: 17
+    scale: 7
     area {
       color: 5579281
       priority: -16324
     }
   }
   element {
-    scale: 18
+    scale: 8
     area {
       color: 5579281
       priority: -16325
     }
   }
   element {
-    scale: 19
+    scale: 9
     area {
       color: 5579281
       priority: -16326
     }
   }
+  element {
+    scale: 10
+    area {
+      color: 5579281
+      priority: -16327
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 5579281
+      priority: -16328
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 5579281
+      priority: -16329
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 5579281
+      priority: -16330
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 5579281
+      priority: -16331
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 5579281
+      priority: -16332
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 5579281
+      priority: -16333
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 5579281
+      priority: -16334
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 5579281
+      priority: -16335
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 5579281
+      priority: -16336
+    }
+  }
 }
 cont {
   name: "natural-grassland"
@@ -39120,28 +39190,28 @@ cont {
     scale: 12
     area {
       color: 1122833
-      priority: -16327
+      priority: -16337
     }
   }
   element {
     scale: 13
     area {
       color: 1122833
-      priority: -16328
+      priority: -16338
     }
   }
   element {
     scale: 14
     area {
       color: 1122833
-      priority: -16329
+      priority: -16339
     }
   }
   element {
     scale: 15
     area {
       color: 1122833
-      priority: -16330
+      priority: -16340
     }
     caption {
       primary {
@@ -39155,7 +39225,7 @@ cont {
     scale: 16
     area {
       color: 1122833
-      priority: -16331
+      priority: -16341
     }
     caption {
       primary {
@@ -39169,7 +39239,7 @@ cont {
     scale: 17
     area {
       color: 1122833
-      priority: -16332
+      priority: -16342
     }
     caption {
       primary {
@@ -39183,7 +39253,7 @@ cont {
     scale: 18
     area {
       color: 1122833
-      priority: -16333
+      priority: -16343
     }
     caption {
       primary {
@@ -39197,7 +39267,7 @@ cont {
     scale: 19
     area {
       color: 1122833
-      priority: -16334
+      priority: -16344
     }
     caption {
       primary {
@@ -39269,6 +39339,76 @@ cont {
 }
 cont {
   name: "natural-lake"
+  element {
+    scale: 0
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
   element {
     scale: 10
     area {
@@ -39727,6 +39867,76 @@ cont {
 }
 cont {
   name: "natural-pond"
+  element {
+    scale: 0
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
   element {
     scale: 10
     area {
@@ -39993,56 +40203,56 @@ cont {
     scale: 12
     area {
       color: 1122833
-      priority: -16335
+      priority: -16345
     }
   }
   element {
     scale: 13
     area {
       color: 1122833
-      priority: -16336
+      priority: -16346
     }
   }
   element {
     scale: 14
     area {
       color: 1122833
-      priority: -16337
+      priority: -16347
     }
   }
   element {
     scale: 15
     area {
       color: 1122833
-      priority: -16338
+      priority: -16348
     }
   }
   element {
     scale: 16
     area {
       color: 1122833
-      priority: -16339
+      priority: -16349
     }
   }
   element {
     scale: 17
     area {
       color: 1122833
-      priority: -16340
+      priority: -16350
     }
   }
   element {
     scale: 18
     area {
       color: 1122833
-      priority: -16341
+      priority: -16351
     }
   }
   element {
     scale: 19
     area {
       color: 1122833
-      priority: -16342
+      priority: -16352
     }
   }
 }
@@ -40403,6 +40613,76 @@ cont {
 }
 cont {
   name: "natural-water"
+  element {
+    scale: 0
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 2241348
+      priority: -15895
+    }
+  }
   element {
     scale: 10
     area {
@@ -40642,42 +40922,42 @@ cont {
     scale: 14
     area {
       color: 2241348
-      priority: -16343
+      priority: -16353
     }
   }
   element {
     scale: 15
     area {
       color: 2241348
-      priority: -16344
+      priority: -16354
     }
   }
   element {
     scale: 16
     area {
       color: 2241348
-      priority: -16345
+      priority: -16355
     }
   }
   element {
     scale: 17
     area {
       color: 2241348
-      priority: -16346
+      priority: -16356
     }
   }
   element {
     scale: 18
     area {
       color: 2241348
-      priority: -16347
+      priority: -16357
     }
   }
   element {
     scale: 19
     area {
       color: 2241348
-      priority: -16348
+      priority: -16358
     }
   }
 }
@@ -40687,173 +40967,61 @@ cont {
     scale: 12
     area {
       color: 2241348
-      priority: -16349
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 2241348
-      priority: -16350
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 2241348
-      priority: -16351
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 2241348
-      priority: -16352
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 2241348
-      priority: -16353
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 2241348
-      priority: -16354
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2241348
-      priority: -16355
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2241348
-      priority: -16356
-    }
-  }
-}
-cont {
-  name: "natural-wood"
-  element {
-    scale: 10
-    area {
-      color: 1122833
-      priority: -16357
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 1122833
-      priority: -16358
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 1122833
       priority: -16359
     }
   }
   element {
     scale: 13
     area {
-      color: 1122833
+      color: 2241348
       priority: -16360
     }
   }
   element {
     scale: 14
     area {
-      color: 1122833
+      color: 2241348
       priority: -16361
     }
   }
   element {
     scale: 15
     area {
-      color: 1122833
+      color: 2241348
       priority: -16362
     }
-    caption {
-      primary {
-        height: 12
-        color: 5592405
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 16
     area {
-      color: 1122833
+      color: 2241348
       priority: -16363
     }
-    caption {
-      primary {
-        height: 16
-        color: 5592405
-        stroke_color: 0
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 17
     area {
-      color: 1122833
+      color: 2241348
       priority: -16364
     }
-    caption {
-      primary {
-        height: 16
-        color: 5592405
-        stroke_color: 0
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 18
     area {
-      color: 1122833
+      color: 2241348
       priority: -16365
     }
-    caption {
-      primary {
-        height: 16
-        color: 5592405
-        stroke_color: 0
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 19
     area {
-      color: 1122833
+      color: 2241348
       priority: -16366
     }
-    caption {
-      primary {
-        height: 16
-        color: 5592405
-        stroke_color: 0
-      }
-      priority: 15000
-    }
   }
 }
 cont {
-  name: "natural-wood-coniferous"
+  name: "natural-wood"
   element {
     scale: 10
     area {
@@ -40965,7 +41133,7 @@ cont {
   }
 }
 cont {
-  name: "natural-wood-deciduous"
+  name: "natural-wood-coniferous"
   element {
     scale: 10
     area {
@@ -41077,7 +41245,7 @@ cont {
   }
 }
 cont {
-  name: "natural-wood-mixed"
+  name: "natural-wood-deciduous"
   element {
     scale: 10
     area {
@@ -41188,6 +41356,118 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wood-mixed"
+  element {
+    scale: 10
+    area {
+      color: 1122833
+      priority: -16397
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 1122833
+      priority: -16398
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 1122833
+      priority: -16399
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 1122833
+      priority: -16400
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1122833
+      priority: -16401
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1122833
+      priority: -16402
+    }
+    caption {
+      primary {
+        height: 12
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1122833
+      priority: -16403
+    }
+    caption {
+      primary {
+        height: 16
+        color: 5592405
+        stroke_color: 0
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1122833
+      priority: -16404
+    }
+    caption {
+      primary {
+        height: 16
+        color: 5592405
+        stroke_color: 0
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1122833
+      priority: -16405
+    }
+    caption {
+      primary {
+        height: 16
+        color: 5592405
+        stroke_color: 0
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1122833
+      priority: -16406
+    }
+    caption {
+      primary {
+        height: 16
+        color: 5592405
+        stroke_color: 0
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "office"
   element {
@@ -45196,7 +45476,7 @@ cont {
     scale: 14
     area {
       color: 2236979
-      priority: -16397
+      priority: -16407
     }
     caption {
       primary {
@@ -45210,7 +45490,7 @@ cont {
     scale: 15
     area {
       color: 2236979
-      priority: -16398
+      priority: -16408
     }
     caption {
       primary {
@@ -45224,7 +45504,7 @@ cont {
     scale: 16
     area {
       color: 2236979
-      priority: -16399
+      priority: -16409
     }
     caption {
       primary {
@@ -45238,7 +45518,7 @@ cont {
     scale: 17
     area {
       color: 2236979
-      priority: -16400
+      priority: -16410
     }
     caption {
       primary {
@@ -45252,7 +45532,7 @@ cont {
     scale: 18
     area {
       color: 2236979
-      priority: -16401
+      priority: -16411
     }
     caption {
       primary {
@@ -45266,7 +45546,7 @@ cont {
     scale: 19
     area {
       color: 2236979
-      priority: -16402
+      priority: -16412
     }
     caption {
       primary {
@@ -46431,14 +46711,14 @@ cont {
     scale: 11
     area {
       color: 2236979
-      priority: -16403
+      priority: -16413
     }
   }
   element {
     scale: 12
     area {
       color: 2236979
-      priority: -16404
+      priority: -16414
     }
     caption {
       primary {
@@ -46453,7 +46733,7 @@ cont {
     scale: 13
     area {
       color: 2236979
-      priority: -16405
+      priority: -16415
     }
     caption {
       primary {
@@ -46474,7 +46754,7 @@ cont {
     scale: 14
     area {
       color: 2236979
-      priority: -16406
+      priority: -16416
     }
     caption {
       primary {
@@ -46495,7 +46775,7 @@ cont {
     scale: 15
     area {
       color: 2236979
-      priority: -16407
+      priority: -16417
     }
     caption {
       primary {
@@ -46516,7 +46796,7 @@ cont {
     scale: 16
     area {
       color: 2236979
-      priority: -16408
+      priority: -16418
     }
     caption {
       primary {
@@ -46537,7 +46817,7 @@ cont {
     scale: 17
     area {
       color: 2236979
-      priority: -16409
+      priority: -16419
     }
     caption {
       primary {
@@ -46558,7 +46838,7 @@ cont {
     scale: 18
     area {
       color: 2236979
-      priority: -16410
+      priority: -16420
     }
     caption {
       primary {
@@ -46579,7 +46859,7 @@ cont {
     scale: 19
     area {
       color: 2236979
-      priority: -16411
+      priority: -16421
     }
     caption {
       primary {
@@ -61436,21 +61716,21 @@ cont {
     scale: 12
     area {
       color: 1122833
-      priority: -16412
+      priority: -16422
     }
   }
   element {
     scale: 13
     area {
       color: 1122833
-      priority: -16413
+      priority: -16423
     }
   }
   element {
     scale: 14
     area {
       color: 1122833
-      priority: -16414
+      priority: -16424
     }
     symbol {
       name: "campsite"
@@ -61461,7 +61741,7 @@ cont {
     scale: 15
     area {
       color: 1122833
-      priority: -16415
+      priority: -16425
     }
     symbol {
       name: "campsite"
@@ -61472,7 +61752,7 @@ cont {
     scale: 16
     area {
       color: 1122833
-      priority: -16416
+      priority: -16426
     }
     symbol {
       name: "campsite"
@@ -61546,35 +61826,35 @@ cont {
     scale: 12
     area {
       color: 1122833
-      priority: -16417
+      priority: -16427
     }
   }
   element {
     scale: 13
     area {
       color: 1122833
-      priority: -16418
+      priority: -16428
     }
   }
   element {
     scale: 14
     area {
       color: 1122833
-      priority: -16419
+      priority: -16429
     }
   }
   element {
     scale: 15
     area {
       color: 1122833
-      priority: -16420
+      priority: -16430
     }
   }
   element {
     scale: 16
     area {
       color: 1122833
-      priority: -16421
+      priority: -16431
     }
   }
   element {
@@ -62075,35 +62355,35 @@ cont {
     scale: 12
     area {
       color: 1122833
-      priority: -16422
+      priority: -16432
     }
   }
   element {
     scale: 13
     area {
       color: 1122833
-      priority: -16423
+      priority: -16433
     }
   }
   element {
     scale: 14
     area {
       color: 1122833
-      priority: -16424
+      priority: -16434
     }
   }
   element {
     scale: 15
     area {
       color: 1122833
-      priority: -16425
+      priority: -16435
     }
   }
   element {
     scale: 16
     area {
       color: 1122833
-      priority: -16426
+      priority: -16436
     }
   }
   element {
@@ -62238,35 +62518,35 @@ cont {
     scale: 12
     area {
       color: 1122833
-      priority: -16427
+      priority: -16437
     }
   }
   element {
     scale: 13
     area {
       color: 1122833
-      priority: -16428
+      priority: -16438
     }
   }
   element {
     scale: 14
     area {
       color: 1122833
-      priority: -16429
+      priority: -16439
     }
   }
   element {
     scale: 15
     area {
       color: 1122833
-      priority: -16430
+      priority: -16440
     }
   }
   element {
     scale: 16
     area {
       color: 1122833
-      priority: -16431
+      priority: -16441
     }
   }
   element {
@@ -62647,6 +62927,76 @@ cont {
 }
 cont {
   name: "waterway-dock"
+  element {
+    scale: 0
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 2241348
+      priority: 1106
+    }
+  }
   element {
     scale: 10
     area {
@@ -63144,6 +63494,76 @@ cont {
 }
 cont {
   name: "waterway-riverbank"
+  element {
+    scale: 0
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 2241348
+      priority: 1028
+    }
+  }
   element {
     scale: 10
     area {
diff --git a/data/styles/include/base_landuse.mapcss b/data/styles/include/base_landuse.mapcss
index 53df235318..ce8900d5ab 100644
--- a/data/styles/include/base_landuse.mapcss
+++ b/data/styles/include/base_landuse.mapcss
@@ -268,7 +268,7 @@ node|z16-[natural=wood],
   text-color: @dark_gray_20;
 }
 
-area|z10-[natural=glacier]
+area|z0-[natural=glacier]
 {
   fill-color: @glacier;
 }
diff --git a/data/styles/include/base_water.mapcss b/data/styles/include/base_water.mapcss
index 3e93972212..2a0d428555 100644
--- a/data/styles/include/base_water.mapcss
+++ b/data/styles/include/base_water.mapcss
@@ -35,11 +35,11 @@ area|z16-[amenity=fountain],
 area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
 area|z13-[leisure=swimming_pool],
-area|z10-[natural=lake],
-area|z10-[natural=pond],
-area|z10-[natural=water],
-area|z10-[waterway=dock],
-area|z10-[waterway=riverbank],
+area|z0-[natural=lake],
+area|z0-[natural=pond],
+area|z0-[natural=water],
+area|z0-[waterway=dock],
+area|z0-[waterway=riverbank],
 area|z14-[natural=bay],
 {
   fill-color: @water;
diff --git a/data/styles/style-light/colors_light.mapcss b/data/styles/style-light/colors_light.mapcss
index 0d683ace85..6962e564cd 100644
--- a/data/styles/style-light/colors_light.mapcss
+++ b/data/styles/style-light/colors_light.mapcss
@@ -35,7 +35,7 @@
 @funicular_z14: #590909;
 @funicular_z15: #4c0f0f;
 @garages: #e1e1e5;
-@glacier: lightblue;
+@glacier: white;
 @gray50: #505050;
 @gray60: #606060;
 @gray70: #707070;
diff --git a/data/visibility.txt b/data/visibility.txt
index ca6a7f6f75..1dbbdbefc1 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -448,16 +448,16 @@ world  00000000000000000000  +
         cave_entrance  00000000000000111111  -
         cliff  00000000000000000000  -
         coastline  11111111111111111111  -
-        glacier  00000000001111111111  -
+        glacier  11111111111111111111  -
         grassland  00000000000011111111  -
         heath  00000000000011111111  -
-        lake  00000000001111111111  -
+        lake  11111111111111111111  -
         land  00000011111111111111  -
         marsh  00000000000000000000  -
         meadow  00000000000000011111  -
         orchard  00000000000000011111  -
         peak  00000000000011111111  -
-        pond  00000000001111111111  -
+        pond  11111111111111111111  -
         rock  00000000000011111111  -
         salt_pond  00000000000000011111  -
         scrub  00000000000011111111  -
@@ -466,7 +466,7 @@ world  00000000000000000000  +
         tree_row  00000000000000001111  -
         vineyard  00000000000000011111  -
         volcano  00000000000011111111  -
-        water  00000000001111111111  -
+        water  11111111111111111111  -
         waterfall  00000000000000111111  -
         wetland  00000000000000111111  +
             bog  00000000000011111111  -
@@ -743,7 +743,7 @@ world  00000000000000000000  +
         ditch  00000000000011111111  +
             tunnel  00000000000000000000  -
             {}
-        dock  00000000001111111111  -
+        dock  11111111111111111111  -
         drain  00000000000011111111  +
             tunnel  00000000000000000000  -
             {}
@@ -752,7 +752,7 @@ world  00000000000000000000  +
         river  00000000001111111111  +
             tunnel  00000000000000000000  -
             {}
-        riverbank  00000000001111111111  -
+        riverbank  11111111111111111111  -
         stream  00000000000011111111  +
             ephemeral  00000000000011111111  -
             intermittent  00000000000011111111  -