diff --git a/data/colors.txt b/data/colors.txt
index 0e08f06446..9aa4e75f18 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -48,7 +48,6 @@
 1775649
 1793568
 1842204
-1844736
 1913758
 1973790
 2004720
@@ -189,7 +188,6 @@
 10167474
 10197647
 10242335
-10400608
 10426903
 10506258
 10592406
@@ -209,7 +207,6 @@
 11781233
 11836942
 11841150
-12000284
 12039862
 12105912
 12303274
@@ -239,7 +236,6 @@
 14951168
 15000299
 15014691
-15022389
 15037299
 15066325
 15086900
@@ -365,7 +361,9 @@
 2152292681
 2153149782
 2157549977
+2159483932
 2160707771
+2162506037
 2163800312
 2164214668
 2566914048
@@ -377,6 +375,8 @@
 3019898879
 3258727484
 3422763904
+3425648640
+3431500856
 3432785840
 3942645760
 4043309055
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 85fd6beb00..a14a2987bd 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 ab54c31b77..a5f29031a6 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -10424,8 +10424,19 @@ cont {
 }
 cont {
   name: "boundary-national_park"
+  element {
+    scale: 10
+    area {
+      color: 3431500856
+      priority: -15307
+    }
+  }
   element {
     scale: 11
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10434,6 +10445,10 @@ cont {
   }
   element {
     scale: 12
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10451,6 +10466,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10469,7 +10488,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10489,7 +10508,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10509,7 +10528,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10529,7 +10548,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10549,7 +10568,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10570,7 +10589,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -33537,24 +33556,38 @@ cont {
 }
 cont {
   name: "landuse-military"
+  element {
+    scale: 12
+    area {
+      color: 2162506037
+      priority: -15500
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2162506037
+      priority: -15500
+    }
+  }
   element {
     scale: 14
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
   }
   element {
     scale: 15
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
   }
   element {
     scale: 16
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -33566,7 +33599,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -33585,7 +33618,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -33604,7 +33637,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -35327,14 +35360,17 @@ cont {
   name: "leisure-nature_reserve"
   element {
     scale: 10
-    symbol {
-      name: "nparkf-s"
-      priority: 16693
-      min_distance: 20
+    area {
+      color: 3431500856
+      priority: -15307
     }
   }
   element {
     scale: 11
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35343,6 +35379,10 @@ cont {
   }
   element {
     scale: 12
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35360,6 +35400,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35378,7 +35422,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35398,7 +35442,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35418,7 +35462,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35438,7 +35482,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35458,7 +35502,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35479,7 +35523,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 7ab8f3b674..8c0b22f9ce 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 143f664cb3..e7635363e7 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -10358,8 +10358,19 @@ cont {
 }
 cont {
   name: "boundary-national_park"
+  element {
+    scale: 10
+    area {
+      color: 3431500856
+      priority: -15307
+    }
+  }
   element {
     scale: 11
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10368,6 +10379,10 @@ cont {
   }
   element {
     scale: 12
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10385,6 +10400,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10403,7 +10422,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10423,7 +10442,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10443,7 +10462,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10463,7 +10482,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10483,7 +10502,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -10504,7 +10523,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -33343,24 +33362,38 @@ cont {
 }
 cont {
   name: "landuse-military"
+  element {
+    scale: 12
+    area {
+      color: 2162506037
+      priority: -15500
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2162506037
+      priority: -15500
+    }
+  }
   element {
     scale: 14
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
   }
   element {
     scale: 15
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
   }
   element {
     scale: 16
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -33372,7 +33405,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -33391,7 +33424,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -33410,7 +33443,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15022389
+      color: 2162506037
       priority: -15500
     }
     symbol {
@@ -35131,8 +35164,19 @@ cont {
 }
 cont {
   name: "leisure-nature_reserve"
+  element {
+    scale: 10
+    area {
+      color: 3431500856
+      priority: -15307
+    }
+  }
   element {
     scale: 11
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35141,6 +35185,10 @@ cont {
   }
   element {
     scale: 12
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35158,6 +35206,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3431500856
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35176,7 +35228,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35196,7 +35248,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35216,7 +35268,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35236,7 +35288,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35256,7 +35308,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
@@ -35277,7 +35329,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 10400608
+      color: 3431500856
       priority: -15307
     }
     symbol {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 60f4cc08f2..6356a85cd3 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 c5badc4590..0e8859e908 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -10358,8 +10358,19 @@ cont {
 }
 cont {
   name: "boundary-national_park"
+  element {
+    scale: 10
+    area {
+      color: 3425648640
+      priority: -15307
+    }
+  }
   element {
     scale: 11
+    area {
+      color: 3425648640
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10368,6 +10379,10 @@ cont {
   }
   element {
     scale: 12
+    area {
+      color: 3425648640
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10385,6 +10400,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3425648640
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -10403,7 +10422,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -10423,7 +10442,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -10443,7 +10462,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -10463,7 +10482,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -10483,7 +10502,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -10504,7 +10523,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -33519,24 +33538,38 @@ cont {
 }
 cont {
   name: "landuse-military"
+  element {
+    scale: 12
+    area {
+      color: 2159483932
+      priority: -15500
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2159483932
+      priority: -15500
+    }
+  }
   element {
     scale: 14
     area {
-      color: 12000284
+      color: 2159483932
       priority: -15500
     }
   }
   element {
     scale: 15
     area {
-      color: 12000284
+      color: 2159483932
       priority: -15500
     }
   }
   element {
     scale: 16
     area {
-      color: 12000284
+      color: 2159483932
       priority: -15500
     }
     symbol {
@@ -33548,7 +33581,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 12000284
+      color: 2159483932
       priority: -15500
     }
     symbol {
@@ -33567,7 +33600,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 12000284
+      color: 2159483932
       priority: -15500
     }
     symbol {
@@ -33586,7 +33619,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 12000284
+      color: 2159483932
       priority: -15500
     }
     symbol {
@@ -35307,8 +35340,19 @@ cont {
 }
 cont {
   name: "leisure-nature_reserve"
+  element {
+    scale: 10
+    area {
+      color: 3425648640
+      priority: -15307
+    }
+  }
   element {
     scale: 11
+    area {
+      color: 3425648640
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35317,6 +35361,10 @@ cont {
   }
   element {
     scale: 12
+    area {
+      color: 3425648640
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35334,6 +35382,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3425648640
+      priority: -15307
+    }
     symbol {
       name: "nparkf-s"
       priority: 16693
@@ -35352,7 +35404,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -35372,7 +35424,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -35392,7 +35444,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -35412,7 +35464,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -35432,7 +35484,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
@@ -35453,7 +35505,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1844736
+      color: 3425648640
       priority: -15307
     }
     symbol {
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index f20cdd28f7..3efa83fdd8 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -12,9 +12,9 @@
   6.2 Line water(river,canal etc.)
 7.LANDUSE
   7.1 Industrial
-  7.2 Hostital
+  7.2 Hospital
   7.3 University & Sport
-  7.4 Cemetry
+  7.4 Cemetery
   7.5 Pedestrian areas
   7.6 Airports
   7.7 Religion
@@ -23,6 +23,7 @@
   8.1 Pier
   8.2 Building
   8.3 Barrier
+9.ISOLINES
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -298,12 +299,12 @@ area|z12-13[landuse=village_green],
 area|z12-13[landuse=field],
 {fill-color: @green0;}
 
-area|z14-[leisure=nature_reserve],
-area|z14-[boundary=national_park],
-{fill-position: background; fill-opacity: 1; fill-color: @green6;}
-
-area|z14-[landuse=military]
-{fill-position: background; fill-opacity: 1; fill-color: @military;}
+/* These 3 types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
+area|z10-[leisure=nature_reserve],
+area|z10-[boundary=national_park],
+{fill-position: background; fill-opacity: 0.2; fill-color: @green6;}
+area|z12-[landuse=military]
+{fill-position: background; fill-opacity: 0.5; fill-color: @military;}
 
 area|z14[landuse=forest],
 area|z14[leisure=park],
@@ -476,7 +477,7 @@ area|z15-[landuse=railway],
 area|z15-[landuse=quarry]
 {fill-color: @industrial;}
 
-/* 7.2 Hostital */
+/* 7.2 Hospital */
 
 area|z14-[amenity=hospital],
 area|z14-[amenity=doctors]
@@ -494,7 +495,7 @@ area|z17-[sport=multi],
 area|z16-[sport=soccer],
 {fill-color: @sport;}
 
-/* 7.4 Cemetry */
+/* 7.4 Cemetery */
 
 area|z14[landuse=cemetery],
 area|z14[amenity=grave_yard]
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 00bbabed52..725df73f28 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -44,7 +44,7 @@
 @beach: #FCEC7E;
 @barerock: #EDE5DC;
 
-/*3.2 Vegeration*/
+/*3.2 Vegetation*/
 
 @forest: #AABF65;
 @green0: #CFD5A8;
@@ -53,7 +53,7 @@
 @green3: #B3C471;
 @green4: #AEC26B;
 @green5: #B0C270;
-@green6: #9EB360;
+@green6: #888C38;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 9e2493187c..ea2fe8dd4f 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -44,7 +44,7 @@
 @beach: #28281A;
 @barerock: #302A2A;
 
-/*3.2 Vegeration*/
+/*3.2 Vegetation*/
 
 @forest: #141C00;
 @green0: #0F1400;
@@ -53,7 +53,7 @@
 @green3: #141C00;
 @green4: #141C00;
 @green5: #141C00;
-@green6: #1C2600;
+@green6: #2F4000;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index 9b5a0cc111..5a2e58cfc2 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -107,7 +107,7 @@
 @green3: #C6D9AB;
 @green4: #C6D9AB;
 @green5: #C6D9AB;
-@green6: #9EB360;
+@green6: #888C38;
 
 /* BUILDINGS */
 @housename: #65655E;
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss
index 7c0d18b5d3..33b1d8e1d4 100644
--- a/data/styles/vehicle/style-night/colors.mapcss
+++ b/data/styles/vehicle/style-night/colors.mapcss
@@ -44,7 +44,7 @@
 @beach: #28281A;
 @barerock: #302A2A;
 
-/*3.2 Vegeration*/
+/*3.2 Vegetation*/
 
 @forest: #090F0A;
 @green0: #090F0A;
@@ -53,7 +53,7 @@
 @green3: #090F0A;
 @green4: #090F0A;
 @green5: #090F0A;
-@green6: #1C2600;
+@green6: #2F4000;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/