diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index ade7656e0..817c4db2d 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -41,7 +41,6 @@
 @glacier: #111111;
 @water: #002222;
 @water_bad: #00261e;
-@river: #062026;
 @wetland: #001919;
 @beach: #28281A;
 @barerock: #302A2A;
@@ -50,17 +49,41 @@
 
 /*3.2 Vegetation*/
 
-@forest: #141C00;
-@heath: #0F1400;
-@green0: #0F1400;
-@green1: #131900;
-@green1b: #141C00;
-@green2: #141C00;
-@green3: #141C00;
-@green4: #141C00;
-@green5: #141C00;
-@green6: #2F4000;
+@residential_garden: #000000;
+@residential_garden_13: #000000;
+@residential_garden_12: #000000;
+@park: #000000;
+@park_13: #000000;
+@park_12: #000000;
+@park_11: #000000;
+@park_10: #000000;
+@heath: #141C00;
+@heath_13: #141C00;
+@heath_12: #141C00;
+@heath_11: #141C00;
+@grass: #141C00;
+@grass_13: #141C00;
+@grass_12: #141C00;
+@grass_11: #141C00;
 @flowers: #141C00;
+@golf: #141C00;
+@golf_13: #141C00;
+@golf_12: #141C00;
+@allotments: #141C00;
+@allotments_13: #141C00;
+@allotments_12: #141C00;
+@scrubs: #141C00;
+@scrubs_13: #141C00;
+@scrubs_12: #141C00;
+@scrubs_11: #141C00;
+@woods: #161F00;
+@woods_13: #161F00;
+@woods_12: #161F00;
+@woods_11: #161F00;
+@woods_10: #161F00;
+
+@protected_nature: #2F4000;
+
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 82ed6fbe3..bade8b6e6 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -111,85 +111,114 @@ area|z11-[landuse=meadow],
 area|z12-[landuse=recreation_ground],
 area|z12-[landuse=village_green],
 area|z11-[natural=scrub],
-area|z14-[leisure=miniature_golf],
 area|z16-[landuse=flowerbed],
 {fill-opacity: 1;}
 
-area|z10-12[leisure=park],
-{fill-color: @green0;}
-area|z13-15[leisure=park],
-{fill-color: @green1;}
-area|z14-15[natural=scrub],
-{fill-color: @green1;}
-area|z16-[leisure=park],
-{fill-color: @green2;}
-area|z16-[natural=scrub],
-{fill-color: @green3;}
+area|z10[leisure=park],
+{fill-color: @park_10;}
+area|z11[leisure=park],
+{fill-color: @park_11;}
+area|z12[leisure=park],
+{fill-color: @park_12;}
+area|z13[leisure=park],
+{fill-color: @park_13;}
+area|z14-[leisure=park],
+{fill-color: @park;}
+
+area|z11[natural=heath],
+{fill-color: @heath_11;}
+area|z12[natural=heath],
+{fill-color: @heath_12;}
+area|z13[natural=heath],
+{fill-color: @heath_13;}
+area|z14-[natural=heath],
+{fill-color: @heath;}
+
+area|z11[landuse=grass],
+area|z11[natural=grassland],
+area|z11[landuse=meadow],
+{fill-color: @grass_11;}
+area|z12[landuse=grass],
+area|z12[natural=grassland],
+area|z12[landuse=meadow],
+area|z12[landuse=recreation_ground],
+area|z12[landuse=village_green],
+{fill-color: @grass_12;}
+area|z13[landuse=grass],
+area|z13[natural=grassland],
+area|z13[landuse=meadow],
+area|z13[landuse=recreation_ground],
+area|z13[landuse=village_green],
+{fill-color: @grass_13;}
+area|z14-[landuse=grass],
+area|z14-[natural=grassland],
+area|z14-[landuse=meadow],
+area|z14-[landuse=recreation_ground],
+area|z14-[landuse=village_green],
+{fill-color: @grass;}
+
 area|z16-[landuse=flowerbed],
 {fill-color: @flowers;}
 
-area|z14-15[landuse=grass],
-{fill-color: @green0;}
-area|z10[landuse=forest],
-area|z16-[landuse=grass],
-area|z14-15[natural=grassland],
+area|z12[leisure=golf_course],
+{fill-color: @golf_12;}
+area|z13[leisure=golf_course],
+{fill-color: @golf_13;}
 area|z14-[leisure=golf_course],
-area|z14-[leisure=miniature_golf],
+{fill-color: @golf;}
+
+area|z12[leisure=garden],
+area|z12[landuse=allotments],
+area|z12[landuse=orchard],
+area|z12[landuse=plant_nursery],
+area|z12[landuse=vineyard],
+{fill-color: @allotments_12;}
+area|z13[leisure=garden],
+area|z13[landuse=allotments],
+area|z13[landuse=orchard],
+area|z13[landuse=plant_nursery],
+area|z13[landuse=vineyard],
+{fill-color: @allotments_13;}
+area|z14-[leisure=garden],
 area|z14-[landuse=allotments],
 area|z14-[landuse=orchard],
 area|z14-[landuse=plant_nursery],
 area|z14-[landuse=vineyard],
-area|z14-15[landuse=meadow],
-area|z14-[landuse=recreation_ground],
-area|z14-[landuse=village_green],
-{fill-color: @green1;}
+{fill-color: @allotments;}
+
+area|z12[leisure=garden][garden:type=residential],
+{fill-color: @residential_garden_12;}
+area|z13[leisure=garden][garden:type=residential],
+{fill-color: @residential_garden_13;}
+area|z14-[leisure=garden][garden:type=residential],
+{fill-color: @residential_garden;}
+
+area|z11[natural=scrub],
+{fill-color: @scrubs_11;}
+area|z12[natural=scrub],
+{fill-color: @scrubs_12;}
+area|z13[natural=scrub],
+{fill-color: @scrubs_13;}
+area|z14-[natural=scrub],
+{fill-color: @scrubs;}
+
+area|z10[landuse=forest],
+{fill-color: @woods_10;}
 area|z11[landuse=forest],
-area|z16-[natural=grassland],
-area|z16-[landuse=meadow],
-{fill-color: @green1b;}
+{fill-color: @woods_11;}
 area|z12[landuse=forest],
-area|z12[leisure=garden],
-{fill-color: @green2;}
+{fill-color: @woods_12;}
 area|z13[landuse=forest],
-area|z13[leisure=garden],
-{fill-color: @green3;}
-area|z14[landuse=forest],
-area|z14[leisure=garden],
-{fill-color: @green4;}
-area|z15[landuse=forest],
-area|z15[leisure=garden],
-{fill-color: @green5;}
-area|z16-[landuse=forest],
-area|z16-[leisure=garden],
-{fill-color: @forest;}
+{fill-color: @woods_13;}
+area|z14-[landuse=forest],
+{fill-color: @woods;}
 
-area|z12-[leisure=garden][garden:type=residential],
-{fill-color: @green0;}
-area|z16-[leisure=garden][garden:type=residential],
-{fill-color: @green1;}
-area|z17-[leisure=garden][garden:type=residential],
-{fill-color: @green2;}
-
-area|z11-[natural=heath],
-{fill-color: @heath;}
-area|z11-13[landuse=grass],
-area|z11-13[natural=grassland],
-area|z12-13[leisure=golf_course],
-area|z12-13[landuse=allotments],
-area|z12-13[landuse=orchard],
-area|z12-13[landuse=plant_nursery],
-area|z12-13[landuse=vineyard],
-area|z11-13[landuse=meadow],
-area|z12-13[landuse=recreation_ground],
-area|z12-13[landuse=village_green],
-area|z11-13[natural=scrub],
-{fill-color: @green0;}
 
 /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
 area|z10-17[leisure=nature_reserve],
 area|z10-17[boundary=national_park],
 area|z10-17[boundary=protected_area][protect_class=1],
-{fill-opacity: 0.2; fill-color: @green6;}
+{fill-opacity: 0.2; fill-color: @protected_nature;}
 
 area|z10-16[boundary=aboriginal_lands],
 {fill-opacity: 0.07; fill-color: @indigenous_lands;}
@@ -250,7 +279,7 @@ line|z13-[waterway=stream],
 line|z13-[waterway=canal],
 line|z13-[waterway=fish_pass],
 line|z13-[natural=strait],
-{opacity: 0.7; color: @river;}
+{opacity: 0.95; color: @water;}
 
 /* 6.1 Area water(lake,pond etc.) */
 
@@ -280,50 +309,56 @@ area|z11-[natural=wetland]
 /* 6.2 Line water(river,canal etc.) */
 
 line|z10[waterway=river],
-{width: 1;}
+{width: 1.4;}
 
 line|z11-12[waterway=river],
-{width: 1.2;}
+{width: 2;}
 
 line|z13[waterway=river],
-{width: 1.6;}
+line|z13[natural=strait],
+{width: 2.7;}
 line|z13[waterway=stream],
 line|z13[waterway=canal],
 line|z13[waterway=fish_pass],
-line|z13[natural=strait],
-{width: 0.7;}
+{width: 1.3;}
 line|z13[waterway=stream][intermittent=yes]
-{width: 0.7;dashes: 2.7,2.7;}
+{width: 1;dashes: 2.7,2.7;}
 
 line|z14[waterway=river],
-{width: 1.8;}
+line|z14[natural=strait],
+{width: 3.5;}
 line|z14[waterway=stream],
 line|z14[waterway=canal],
 line|z14[waterway=fish_pass],
-line|z14[natural=strait],
-{width: 1;}
+{width: 1.5;}
 line|z14[waterway=stream][intermittent=yes]
-{width: 1;dashes: 2.7,2.7;}
+{width: 1.2;dashes: 2.7,2.7;}
 
 line|z15-[waterway=river],
-{width: 2.2;}
+line|z15-[natural=strait],
+{width: 4.6;}
 line|z15-[waterway=stream],
 line|z15-[waterway=canal],
 line|z15-[waterway=fish_pass],
-line|z15-[natural=strait],
-{width: 1.6;}
+{width: 1.8;}
 line|z15-[waterway=stream][intermittent=yes]
-{width: 1.4;dashes: 4.95,4.95;}
+{width: 1.6;dashes: 4.95,4.95;}
 
 node|z16-[waterway=lock_gate],
 {icon-image: dot-m.svg;}
 
 line|z13-[waterway=ditch],
 line|z13-[waterway=drain],
-{opacity: 0.7; color: @water_bad; width: 1.5; dashes: 2.7,2.7;}
+{opacity: 0.8; color: @water_bad; width: 1.5; dashes: 5.4,2.7;}
+line|z14[waterway=ditch],
+line|z14[waterway=drain],
+{opacity: 0.9;}
+line|z15-[waterway=ditch],
+line|z15-[waterway=drain],
+{opacity: 0.95;}
 line|z16-[waterway=ditch],
 line|z16-[waterway=drain],
-{width: 3;}
+{width: 2;}
 
 /* Do not draw tunnel waterways */
 line[waterway][tunnel]
@@ -379,10 +414,10 @@ area|z13-[landuse=education],
 area|z15-[amenity=university],
 {fill-opacity: 0.9;}
 
-
 area|z13-[landuse=retail],
 {fill-color: @retail; fill-opacity: 1;}
 
+area|z14-[leisure=miniature_golf],
 area|z15-[leisure=pitch],
 area|z15-[leisure=track][area?],
 area|z15-[leisure=fitness_station],
@@ -402,17 +437,9 @@ area|z14-[piste:type=snow_park],
 
 /* 7.4 Cemetery */
 
-area|z14[landuse=cemetery],
-area|z14[amenity=grave_yard]
-{fill-color: @green2;fill-opacity: 0.85;}
-
-area|z15-[amenity=grave_yard],
-area|z15-[landuse=cemetery]
-{fill-color: @green2;}
-
-area|z16-[amenity=grave_yard],
-area|z16-[landuse=cemetery]
-{fill-color: @green3;}
+area|z14-[landuse=cemetery],
+area|z14-[amenity=grave_yard]
+{fill-color: @flowers;}
 
 /* 7.5 Pedestrian areas */
 
@@ -565,7 +592,7 @@ line|z19-[waterway=weir],
 {width: 8;}
 
 line|z14-[man_made=cutline],
-{width: 1;color: @green0; opacity: 0.4;}
+{width: 1;color: @grass;}
 line|z15[man_made=cutline],
 {width: 1.5;}
 line|z16[man_made=cutline],
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index 29ec531b7..73e533487 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -39,9 +39,8 @@
 /* 3.1 Main natural */
 
 @glacier: #FFFFFF;
-@water: #8AD8E7;
-@water_bad: #95C5B8;
-@river: #5FB4C5;
+@water: #9EE4F2;
+@water_bad: #9CD7DE;
 @wetland: #C3E0D1;
 @beach: #FADDA0;
 @barerock: #D9D2BF;
@@ -50,17 +49,40 @@
 
 /*3.2 Vegetation*/
 
+@residential_garden: #EDE5CA;
+@residential_garden_13: #EDE5CB;
+@residential_garden_12: #EEE6CB;
+@park: #D5DB8F;
+@park_13: #D6DC93;
+@park_12: #D8DD96;
+@park_11: #D8DC97;
+@park_10: #DBDD9D;
 @heath: #CED797;
-@green0: #C8D48C;
-@green1: #C4D181;
-@green1b: #BECC76;
-@green2: #B6C96B;
-@green3: #B0C763;
-@green4: #B2C76A;
-@green5: #ADC45F;
-@forest: #A8BE5C;
-@green6: #7B8F35;
-@flowers: #B6C96B;
+@heath_13: #CFD89A;
+@heath_12: #D2D99E;
+@heath_11: #D4DAA0;
+@grass: #C4D181;
+@grass_13: #C6D285;
+@grass_12: #C9D48A;
+@grass_11: #CCD58E;
+@flowers: #BECC76;
+@golf: #B9C96F;
+@golf_13: #BBCB73;
+@golf_12: #BECC78;
+@allotments: #D5D395;
+@allotments_13: #D6D498;
+@allotments_12: #D8D59B;
+@scrubs: #B1C765;
+@scrubs_13: #B4C96B;
+@scrubs_12: #B8CB71;
+@scrubs_11: #BCCC76;
+@woods: #A4BD4F;
+@woods_13: #A8BE55;
+@woods_12: #ACC25C;
+@woods_11: #B1C462;
+@woods_10: #B4C469;
+
+@protected_nature: #7B8F35;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
@@ -80,7 +102,7 @@
 @parking: #E8EFEC;
 @military: #DE2D28;
 @prison: #727272;
-@farmland: #E4E0AD;
+@farmland: #E3DEAC;
 @farmyard: #E6D6AF;
 
 /*4.2 Aerodrome*/
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index b4dc638ea..4c50ea1d1 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -11,7 +11,7 @@ line|z12-[waterway=stream],
 line|z13-[waterway=fish_pass],
 line|z15-[waterway=ditch],
 line|z15-[waterway=drain],
-{opacity: 1; color: @river;}
+{opacity: 1; color: @water;}
 
 /* 6.2 Line water(river,canal etc.) */
 
@@ -23,14 +23,14 @@ line|z13-[waterway=fish_pass],
 {text-color: @water_label; text-halo-opacity: 0.5; text-halo-radius: 1; text-halo-color: @label_halo_light;}
 
 line|z10[waterway=river],
-{width: 1.4; opacity: 0.7;}
+{width: 1.4;}
 
 line|z11-12[waterway=river],
 line|z11-12[natural=strait],
-{width: 2; opacity: 0.7;}
+{width: 2;}
 line|z12[waterway=stream],
 line|z12[waterway=canal],
-{width: 1; opacity: 0.5;}
+{width: 1;}
 
 line|z13[waterway=river],
 line|z13[natural=strait],
@@ -38,11 +38,11 @@ line|z13[natural=strait],
 line|z13[waterway=stream],
 line|z13[waterway=canal],
 line|z13[waterway=fish_pass],
-{width: 1.3; opacity: 0.7;}
+{width: 1.3;}
 line|z11-12[waterway=stream][intermittent],
 {width: 0; text: none;}
 line|z13[waterway=stream][intermittent],
-{width: 1; dashes: 2.7,2.7; opacity: 0.7;}
+{width: 1; dashes: 2.7,2.7;}
 
 line|z14[waterway=river],
 line|z14[natural=strait],
@@ -74,7 +74,7 @@ line[waterway][tunnel]
 
 
 line|z13-[man_made=cutline],
-{width: 1.7; color: @green0; opacity: 0.6;}
+{width: 1.7; color: @grass;}
 line|z14[man_made=cutline],
 {width: 2.2;}
 line|z15[man_made=cutline],