diff --git a/data/resources-6plus_clear/area-hatching.png b/data/resources-6plus_clear/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-6plus_clear/area-hatching.png differ
diff --git a/data/resources-6plus_dark/area-hatching.png b/data/resources-6plus_dark/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-6plus_dark/area-hatching.png differ
diff --git a/data/resources-hdpi_clear/area-hatching.png b/data/resources-hdpi_clear/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-hdpi_clear/area-hatching.png differ
diff --git a/data/resources-hdpi_dark/area-hatching.png b/data/resources-hdpi_dark/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-hdpi_dark/area-hatching.png differ
diff --git a/data/resources-mdpi_clear/area-hatching.png b/data/resources-mdpi_clear/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-mdpi_clear/area-hatching.png differ
diff --git a/data/resources-mdpi_dark/area-hatching.png b/data/resources-mdpi_dark/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-mdpi_dark/area-hatching.png differ
diff --git a/data/resources-xhdpi_clear/area-hatching.png b/data/resources-xhdpi_clear/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-xhdpi_clear/area-hatching.png differ
diff --git a/data/resources-xhdpi_dark/area-hatching.png b/data/resources-xhdpi_dark/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-xhdpi_dark/area-hatching.png differ
diff --git a/data/resources-xxhdpi_clear/area-hatching.png b/data/resources-xxhdpi_clear/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-xxhdpi_clear/area-hatching.png differ
diff --git a/data/resources-xxhdpi_dark/area-hatching.png b/data/resources-xxhdpi_dark/area-hatching.png
new file mode 100644
index 0000000000..36f7b6f0b1
Binary files /dev/null and b/data/resources-xxhdpi_dark/area-hatching.png differ
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index db4168c38c..4a1b101ed8 100755
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -65,8 +65,7 @@ area[amenity=parking]
 {z-index: 6;}
 
 area[natural=wood],
-area[landuse=forest],
-area[leisure=nature_reserve]
+area[landuse=forest]
 {z-index: 30;}
 
 area[leisure=park],
@@ -82,6 +81,10 @@ area[landuse=meadow],
 area[landuse=recreation_ground],
 area[landuse=village_green],
 area[landuse=field],
+{z-index: 41;}
+
+area[natural=wetland],
+line[waterway=stream][intermittent=yes]
 {z-index: 42;}
 
 area[landuse=cemetery],
@@ -103,10 +106,6 @@ area[leisure=golf_course],
 area[natural=heath]
 {z-index: 45;}
 
-area[natural=wetland],
-line[waterway=stream][intermittent=yes]
-{z-index: 49;}
-
 line[waterway=river],
 line[waterway=riverbank],
 line[waterway=stream],
@@ -146,6 +145,11 @@ line[man_made=cutline]
 line[boundary=administrative]
 {z-index: 130;}
 
+area[leisure=nature_reserve],
+area[boundary=national_park],
+area[landuse=military]
+{z-index: 140;}
+
 area[building],
 area[building:part],
 area[landuse=garages],
@@ -246,12 +250,8 @@ area|z12-[landuse=village_green],
 area|z12-[landuse=field],
 {fill-position: background; fill-opacity: 1;}
 
-area|z10-[leisure=nature_reserve]
-{fill-position: background; fill-opacity: 0.2;}
-
 area|z10[natural=wood],
 area|z10[landuse=forest],
-area|z10[leisure=nature_reserve],
 area|z14-[landuse=grass],
 area|z14-[natural=grassland],
 area|z14-[leisure=golf_course],
@@ -269,14 +269,12 @@ area|z14-[landuse=field],
 
 area|z11-12[natural=wood],
 area|z11-12[landuse=forest],
-area|z11-12[leisure=nature_reserve],
 area|z10-12[leisure=park],
 area|z12[leisure=garden],
 {fill-color: @green2;}
 
 area|z13[natural=wood],
 area|z13[landuse=forest],
-area|z13[leisure=nature_reserve],
 area|z13[leisure=park],
 area|z13[leisure=garden]
 {fill-color: @green3;}
@@ -296,23 +294,27 @@ 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;}
+
 area|z14[natural=wood],
 area|z14[landuse=forest],
-area|z14[leisure=nature_reserve],
 area|z14[leisure=park],
 area|z14[leisure=garden]
 {fill-color: @green4;}
 
 area|z15[natural=wood],
 area|z15[landuse=forest],
-area|z15[leisure=nature_reserve],
 area|z15[leisure=park],
 area|z15[leisure=garden]
 {fill-color: @green5;}
 
 area|z16-[natural=wood],
 area|z16-[landuse=forest],
-area|z16-[leisure=nature_reserve],
 area|z16-[leisure=park],
 area|z16-[leisure=garden]
 {fill-color: @forest;}
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 9ba0e5bc4c..3b7ce378a5 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -52,6 +52,7 @@
 @green3: #B3C471;
 @green4: #AEC26B;
 @green5: #B0C270;
+@green6: #9EB360;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
@@ -63,6 +64,7 @@
 @industrial: #E4E2EB;
 @sport: #D1CDA7;
 @parking: #F2F2CE;
+@military: #E53935;
 
 /*4.2 Aerodrome*/
 
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index d6d8a5d998..b4be580d82 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -52,6 +52,7 @@
 @green3: #141C00;
 @green4: #141C00;
 @green5: #141C00;
+@green6: #1C2600;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
@@ -63,6 +64,7 @@
 @industrial: #191419;
 @sport: #21211B;
 @parking: #1F1B1B;
+@military: #B71C1C;
 
 /*4.2 Aerodrome*/
 
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index b047f7aa50..eab4bdf164 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -104,6 +104,7 @@
 @green3: #C6D9AB;
 @green4: #C6D9AB;
 @green5: #C6D9AB;
+@green6: #9EB360;
 
 /* BUILDINGS */
 @housename: #65655E;
@@ -124,6 +125,7 @@
 @sport: #C8DBAD;
 @parking: #F2F2CE;
 @parking_l: #FCFCC2;/*#F0EBC5;DCDCB9; #F2F2CE;*/
+@military: #E53935;
 
 /* BARRIERS */
 @fence: #999999;
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss
index c6267ddd13..7f99fb8486 100644
--- a/data/styles/vehicle/style-night/colors.mapcss
+++ b/data/styles/vehicle/style-night/colors.mapcss
@@ -52,6 +52,7 @@
 @green3: #090F0A;
 @green4: #090F0A;
 @green5: #090F0A;
+@green6: #1C2600;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
@@ -64,6 +65,7 @@
 @sport: #070F0A;
 @parking: #332D14;
 @parking_l: #403819;
+@military: #B71C1C;
 
 /*4.2 Aerodrome*/