diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index 5271f707a..3b95d0253 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -101,6 +101,8 @@
/* 5.ROADS */
/* 5.1 All roads */
+@motorway0: #3B2015;
+@motorway1: #3B2015;
@trunk0: #49291B;
@trunk1: #49291B;
@primary0: #593323;
@@ -126,6 +128,8 @@
/* 5.3 Tunnels */
+@motorway_tunnel: #24140D;
+@motorway_tunnel_casing: #000000;
@trunk_tunnel: #381F14;
@trunk_tunnel_casing: #000000;
@primary_tunnel: #4C2A1B;
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 904d1ff7b..1af4d191b 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -548,11 +548,11 @@ line|z19-[man_made=cutline],
area|z14[building],
area|z14[waterway=dam],
-{fill-color: @building0;fill-opacity: 0.5;}
+{fill-color: @building0;fill-opacity: 0.6;}
area|z15[building],
area|z15[waterway=dam],
-{fill-color: @building0;fill-opacity: 0.6;}
+{fill-color: @building0;fill-opacity: 0.7;}
area|z14-15[aeroway=terminal],
area|z16[building],
diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss
index 6fd441ae8..83b5fa470 100644
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -53,7 +53,7 @@
line|z6-9[highway=world_towns_level],
line|z4-9[highway=world_level],
-{color: @trunk1;opacity: 1;}
+{color: @motorway1;opacity: 1;}
line|z4[highway=world_level]
{width: 0.5;}
@@ -73,15 +73,17 @@ line|z9[highway=world_level]
/* 3.TRUNK & MOTORWAY 6-22 ZOOM */
-line|z6[highway=trunk],
line|z6[highway=motorway],
-{color: @trunk0; opacity: 0.3;}
-line|z7-9[highway=trunk],
+{color: @motorway0; opacity: 1;}
+line|z6[highway=trunk],
+{color: @trunk0; opacity: 0.6;}
line|z7-9[highway=motorway],
-{color: @trunk0; opacity: 0.7;}
-
-line|z10-[highway=trunk],
+{color: @motorway0; opacity: 1;}
+line|z7-9[highway=trunk],
+{color: @trunk0; opacity: 0.8;}
line|z10-[highway=motorway],
+{color: @motorway1; opacity: 0.7;}
+line|z10-[highway=trunk],
{color: @trunk1; opacity: 0.7;}
line|z10-[highway=motorway_link],
line|z10-[highway=trunk_link],
@@ -110,85 +112,112 @@ line|z14-[highway=trunk_link][bridge?]::bridgeblack,
/* 3.1 Trunk & Motorway 6-22 ZOOM */
-line|z6[highway=trunk],
line|z6[highway=motorway],
+{width: 0.9;}
+line|z7[highway=motorway]
+{width: 1.0;}
+line|z8[highway=motorway]
+{width: 1.2;}
+line|z9[highway=motorway]
+{width: 1.3;}
+line|z10[highway=motorway]
+{width: 1.7;}
+line|z11[highway=motorway]
+{width: 1.8;}
+line|z12[highway=motorway]
+{width: 2.0;}
+line|z13[highway=motorway],
+{width: 2.9;}
+line|z14[highway=motorway],
+{width: 3.9;}
+line|z15[highway=motorway],
+{width: 4.5;}
+line|z16[highway=motorway],
+{width: 6.1;}
+line|z17[highway=motorway],
+{width: 8.3;}
+line|z18[highway=motorway],
+{width: 11.1;}
+line|z19-[highway=motorway],
+{width: 13.6;}
+
+line|z6[highway=trunk],
{width: 0.8;}
line|z7[highway=trunk],
-line|z7[highway=motorway]
{width: 0.9;}
line|z8[highway=trunk],
-line|z8[highway=motorway]
{width: 1.1;}
line|z9[highway=trunk],
-line|z9[highway=motorway]
{width: 1.2;}
line|z10[highway=trunk],
-line|z10[highway=motorway]
{width: 1.5;}
line|z11[highway=trunk],
-line|z11[highway=motorway]
{width: 1.7;}
line|z12[highway=trunk],
-line|z12[highway=motorway]
{width: 1.9;}
line|z13[highway=trunk],
-line|z13[highway=motorway],
{width: 2.8;}
line|z14[highway=trunk],
-line|z14[highway=motorway],
{width: 3.8;}
line|z15[highway=trunk],
-line|z15[highway=motorway],
{width: 4.4;}
line|z16[highway=trunk],
-line|z16[highway=motorway],
{width: 6;}
line|z17[highway=trunk],
-line|z17[highway=motorway],
{width: 8.2;}
line|z18[highway=trunk],
-line|z18[highway=motorway],
{width: 11;}
line|z19-[highway=trunk],
-line|z19-[highway=motorway],
{width: 13.5;}
line|z10[highway=motorway_link],
+{width: 0.9;}
+line|z11[highway=motorway_link],
+{width: 1.1;}
+line|z12[highway=motorway_link],
+{width: 1.4;}
+line|z13[highway=motorway_link],
+{width: 1.9;}
+line|z14[highway=motorway_link],
+{width: 2.7;}
+line|z15[highway=motorway_link],
+{width: 3.7;}
+line|z16[highway=motorway_link],
+{width: 5.1;}
+line|z17[highway=motorway_link],
+{width: 6.7;}
+line|z18[highway=motorway_link],
+{width: 9.5;}
+line|z19-[highway=motorway_link],
+{width: 11.7;}
+
line|z10[highway=trunk_link]
{width: 0.8;}
-line|z11[highway=motorway_link],
line|z11[highway=trunk_link]
{width: 1.0;}
-line|z12[highway=motorway_link],
line|z12[highway=trunk_link]
{width: 1.3;}
-line|z13[highway=motorway_link],
line|z13[highway=trunk_link]
{width: 1.8;}
-line|z14[highway=motorway_link],
line|z14[highway=trunk_link]
{width: 2.6;}
-line|z15[highway=motorway_link],
line|z15[highway=trunk_link]
{width: 3.6;}
-line|z16[highway=motorway_link],
line|z16[highway=trunk_link]
{width: 5;}
-line|z17[highway=motorway_link],
line|z17[highway=trunk_link]
{width: 6.6;}
-line|z18[highway=motorway_link],
line|z18[highway=trunk_link]
{width: 9.4;}
-line|z19-[highway=motorway_link],
line|z19-[highway=trunk_link]
{width: 11.6;}
/* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */
line|z12-[highway=motorway][tunnel?],
-line|z12-[highway=trunk][tunnel?],
line|z13-[highway=motorway_link][tunnel?],
+{color: @motorway_tunnel; casing-linecap: butt; casing-color: @motorway_tunnel_casing; casing-opacity: 0.7;}
+line|z12-[highway=trunk][tunnel?],
line|z13-[highway=trunk_link][tunnel?],
{color: @trunk_tunnel; casing-linecap: butt; casing-color: @trunk_tunnel_casing; casing-opacity: 0.7;}
@@ -246,16 +275,12 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack
/* 4.PRIMARY 8-22 ZOOM */
line|z8-10[highway=primary],
-{color: @primary0; opacity: 0.7;}
-
-line|z11-12[highway=primary],
-line|z11-12[highway=primary_link]
-{color: @primary1; opacity: 0.7;}
-line|z13-14[highway=primary],
-line|z13-14[highway=primary_link],
-{color: @primary1; opacity: 0.85;}
-line|z15-[highway=primary],
-line|z15-[highway=primary_link],
+{color: @primary1; opacity: 1;}
+line|z11-13[highway=primary],
+line|z11-13[highway=primary_link]
+{color: @primary0; opacity: 0.9;}
+line|z14-[highway=primary],
+line|z14-[highway=primary_link],
{color: @primary2; opacity: 1;}
line|z14-[highway=primary][bridge?]::bridgewhite,
@@ -268,9 +293,9 @@ line|z14-[highway=primary_link][bridge?]::bridgeblack,
/* 4.1 Primary 8-22 ZOOM */
line|z8[highway=primary],
-{width: 0.7;}
-line|z9[highway=primary],
{width: 0.8;}
+line|z9[highway=primary],
+{width: 0.9;}
line|z10[highway=primary],
{width: 1.2;}
line|z11[highway=primary],
@@ -349,7 +374,7 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack,
/* 5.SECONDARY 10-22 ZOOM */
line|z10-12[highway=secondary],
-{color: @secondary0; opacity: 0.8;}
+{color: @secondary0; opacity: 1;}
line|z13-14[highway=secondary],
line|z13-14[highway=secondary_link],
{color: @secondary1; opacity: 0.9;}
@@ -614,7 +639,7 @@ line|z18-[highway=residential][bridge?]::bridgeblack,
line|z15-[highway=service],
line|z15-[highway=service][service=busway],
line|z15-[highway=busway],
-{color: @residential; opacity: 0.8;}
+{color: @residential; opacity: 0.9;}
line|z15[highway=service],
line|z15[highway=service][service=busway],
@@ -643,11 +668,32 @@ line|z19-[highway=busway],
line|z13-[highway=pedestrian],
line|z13-[highway=ford]
-{color: @pedestrian;opacity: 0.85;}
+{color: @pedestrian;opacity: 0.9;}
+
line|z13-[highway=cycleway],
line|z14-[highway=path][bicycle=designated]::cycleline,
line|z15-[highway=footway][bicycle=designated]::cycleline,
{color: @cycleway;}
+
+line|z14-[highway=path][bicycle=designated]::cycleline,
+line|z15-[highway=footway][bicycle=designated]::cycleline,
+{dashes: 7,9.6;}
+line|z16[highway=path][bicycle=designated]::cycleline,
+line|z16[highway=footway][bicycle=designated]::cycleline,
+{dashes: 7.5,9.5;}
+line|z17[highway=path][bicycle=designated]::cycleline,
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{dashes: 8,9.4;}
+line|z18[highway=path][bicycle=designated]::cycleline,
+line|z18[highway=footway][bicycle=designated]::cycleline,
+{dashes: 8.5,9.3;}
+line|z19-[highway=path][bicycle=designated]::cycleline,
+line|z19-[highway=footway][bicycle=designated]::cycleline,
+{dashes: 9,9.2;}
+
+
+
+
line|z13-[highway=construction],
{color: @construction;opacity: 0.7;}
line|z13-[highway=pedestrian][bridge?]::bridgewhite,
@@ -679,9 +725,9 @@ line|z15-[leisure=track][!area],
line|z14-[highway=bridleway]
{color: @bridleway;opacity: 0.6;}
line|z15-[highway=footway],
-{color: @footway;opacity: 0.75;}
+{color: @footway;opacity: 0.8;}
line|z15-[highway=steps],
-{color: @footway;opacity: 0.85;}
+{color: @footway;opacity: 0.9;}
line|z14-[highway=path],
{color: @path;opacity: 0.6;}
line|z14-[highway=path][_path_grade=expert],
@@ -711,25 +757,25 @@ line|z17-[highway=steps][tunnel?]::tunnelCasing,
line|z13[highway=pedestrian],
line|z13[highway=ford]
-{width: 1;dashes: 2,1;}
+{width: 1;dashes: 4,1;}
line|z14[highway=pedestrian],
line|z14[highway=ford]
-{width: 1.6;dashes: 3.6,1.6;}
+{width: 1.6;dashes: 6,1.3;}
line|z15[highway=pedestrian],
line|z15[highway=ford]
-{width: 2;dashes: 5,2.2;}
+{width: 2;dashes: 8,1.5;}
line|z16[highway=pedestrian],
line|z16[highway=ford]
-{width: 2.4;dashes: 5.4,2.7;}
+{width: 2.4;dashes: 8,1.5;}
line|z17[highway=pedestrian],
line|z17[highway=ford]
-{width: 3;dashes: 5,2;}
+{width: 3;dashes: 9,1.8;}
line|z18[highway=pedestrian],
line|z18[highway=ford]
-{width: 4;dashes: 7,3;opacity: 1;}
+{width: 4;dashes: 11,2.3;opacity: 1;}
line|z19-[highway=pedestrian],
line|z19-[highway=ford]
-{width: 5;dashes: 16.2,8.1;opacity: 1;}
+{width: 5;dashes: 13,2.7;opacity: 1;}
/* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */
@@ -757,24 +803,24 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
/* 8.4 Cycleway 13-22 ZOOM */
line|z13[highway=cycleway],
-{opacity: 0.3;}
+{opacity: 0.5;}
line|z14[highway=cycleway],
line|z14[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.4;}
+{opacity: 0.6;}
line|z15[highway=cycleway],
line|z15[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.5;}
+{opacity: 0.7;}
line|z16-17[highway=cycleway],
line|z16-17[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.6;}
+{opacity: 0.8;}
line|z18-[highway=cycleway],
line|z18-[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.8;}
+{opacity: 1;}
line|z15-16[highway=footway][bicycle=designated]::cycleline,
-{opacity: 0.4;}
-line|z17-[highway=footway][bicycle=designated]::cycleline,
-{opacity: 0.5;}
+{opacity: 0.6;}
+line|z15-16[highway=footway][bicycle=designated]::cycleline,
+{opacity: 0.7;}
line|z13[highway=cycleway]
{width: 0.9;}
@@ -953,26 +999,26 @@ line|z17-[highway=track][bridge?]::bridgeblack
/* 8.7 Footway 15-22 ZOOM */
line|z15[highway=footway]
-{width: 1.5; dashes: 5,2;}
+{width: 1.5; dashes: 5,1.5;}
line|z16[highway=footway]
-{width: 2; dashes: 5,2;}
+{width: 2; dashes: 5,1.5;}
line|z17[highway=footway]
-{width: 2.4; dashes: 6,2.5;}
+{width: 2.4; dashes: 6,1.8;}
line|z18[highway=footway]
-{width: 3.2; dashes: 8,3; opacity: 1;}
+{width: 3.2; dashes: 8,2.3; opacity: 1;}
line|z19-[highway=footway],
-{width: 4.2; dashes: 10,3.5; opacity: 1;}
+{width: 4.2; dashes: 10,2.7;opacity: 1;}
line|z15[highway=footway][bicycle=designated],
-{width: 1.5; dashes: 5,3;}
+{width: 1.5; dashes: none;}
line|z16[highway=footway][bicycle=designated],
-{width: 2; dashes: 5,3;}
+{width: 2; dashes: none;}
line|z17[highway=footway][bicycle=designated],
-{width: 2.4; dashes: 6,4.2; opacity: 0.9;}
+{width: 2.4; dashes: none; opacity: 0.9;}
line|z18[highway=footway][bicycle=designated],
-{width: 3.2; dashes: 8,5.5; opacity: 1;}
+{width: 3.2; dashes: none; opacity: 1;}
line|z19-[highway=footway][bicycle=designated],
-{width: 4.2; dashes: 10,6.7; opacity: 1;}
+{width: 4.2; dashes: none; opacity: 1;}
/* Don't display sidewalks and pedestrian crossings on z15. */
line|z15[highway=footway][footway=sidewalk],
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 46230d9b0..2f3e2a944 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -45,10 +45,6 @@ power-line # line z19- (also has line::
power-line::dash # line::dash z19- (also has line z19-)
=== 340
-highway-cycleway # line z13- (also has pathtext z15-)
-highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway-crossing # line z16-
highway-steps # line z15- (also has pathtext z16-)
highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
@@ -192,16 +188,26 @@ highway-secondary_link-tunnel # line z13- (also has line(c
=== 224
# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-)
-# === 223
-
highway-tertiary_link # line z14- (also has pathtext z18-)
highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-)
+=== 223
+
+highway-busway # line z15- (also has pathtext z16-)
+highway-busway-bridge # line z15- (also has pathtext z16-)
+highway-busway-tunnel # line z15- (also has pathtext z16-)
+highway-service # line z15- (also has pathtext z16-)
+highway-service-area # line z15- (also has pathtext z16-)
+highway-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-)
+highway-service-driveway # line z16- (also has pathtext z16-)
+highway-service-parking_aisle # line z15- (also has pathtext z16-)
+highway-service-tunnel # line z15- (also has pathtext z16-)
+# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-)
=== 222
-# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-)
-# === 221
-
+highway-cycleway # line z13- (also has pathtext z15-)
+highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
railway-light_rail::dash # line::dash z16- (also has line z13-)
railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
railway-rail::dash # line::dash z16- (also has line z11-)
@@ -254,15 +260,8 @@ highway-pedestrian-tunnel # line z13- (also has line(c
# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-)
# === 199
-highway-busway # line z15- (also has pathtext z16-)
-highway-busway-bridge # line z15- (also has pathtext z16-)
-highway-busway-tunnel # line z15- (also has pathtext z16-)
-highway-service # line z15- (also has pathtext z16-)
-highway-service-area # line z15- (also has pathtext z16-)
-highway-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-)
-highway-service-driveway # line z16- (also has pathtext z16-)
-highway-service-parking_aisle # line z15- (also has pathtext z16-)
-highway-service-tunnel # line z15- (also has pathtext z16-)
+highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-)
+highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-)
=== 190
highway-bridleway # line z14- (also has pathtext z15-)
@@ -271,6 +270,7 @@ highway-bridleway-tunnel # line z14- (also has line::
highway-footway # line z15- (also has pathtext z15-)
highway-footway-area # line z15- and area z14- (also has pathtext z15-)
highway-footway-bicycle # line z15- (also has line::cycleline z15-, pathtext z15-)
+highway-footway-crossing # line z16-
highway-path # line z14- (also has pathtext z15-)
highway-path-bicycle # line z14- (also has line::cycleline z14-, pathtext z15-)
highway-path-difficult # line z14- (also has pathtext z15-)
@@ -283,10 +283,6 @@ highway-track-no-access # line z14- (also has pathte
highway-track-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
=== 180
-highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-)
-highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-)
-=== 170
-
highway-construction # line z13- (also has pathtext z15-)
leisure-track # line z15- (also has caption z16-)
railway-abandoned # line z16-
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index bba1c937a..f0c223672 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -3,16 +3,16 @@
1.BASEMAP
2.BOUNDARY
3.NATURAL
- 3.1 Main natural
- 3.2 Vegetation
+ 3.1 Main natural
+ 3.2 Vegetation
4.LANDUSE
- 4.1 Main landuse
- 4.2 Aerodrome
+ 4.1 Main landuse
+ 4.2 Aerodrome
4.3 Barriers
4.4 Buildings
5.ROADS
5.1 All roads
- 5.2 Bridges
+ 5.2 Bridges
5.3 Tunnels
5.4 Piste
5.5 Transport
@@ -26,7 +26,7 @@
/* 1.BASEMAP */
-@background: #E3E1D2;
+@background: #F5E8D6;
/* 2.BOUNDARY */
@@ -38,99 +38,103 @@
/* 3.1 Main natural */
@glacier: #FFFFFF;
-@water: #8BD3E0;
-@water_bad: #9dc7c1;
-@river: #36B0BF;
-@wetland: #c9ddd6;
-@beach: #FCEC7E;
+@water: #8AD8E7;
+@water_bad: #95C5B8;
+@river: #5FB4C5;
+@wetland: #A8DCDC;
+@beach: #FFE7B7;
@barerock: #D9D2BF;
@scree: #CCC7BA;
-@desert: #EEE5B2;
+@desert: #F6E5CE;
/*3.2 Vegetation*/
-@green0: #CFD5A8;
-@green1: #C6CF93;
-@green1b: #C1CC89;
-@green2: #BCC87E;
-@green3: #B3C471;
-@green4: #AEC26B;
-@green5: #B0C270;
-@forest: #AABF65;
-@green6: #888C38;
-@flowers: #B3C471;
+@green0: #C8D48C;
+@green1: #C4D181;
+@green1b: #BECC76;
+@green2: #B6C96B;
+@green3: #B0C763;
+@green4: #B2C76A;
+@green5: #ADC45F;
+@forest: #A8BE5C;
+@green6: #7B8F35;
+@flowers: #B6C96B;
/* 4.LANDUSE */
/*4.1 Main landuse*/
-@pedestrian_area: #EDE8D6;
-@pedestrian_area_light: #F2EEDA;
-@university: #F8E4BA;
-@hospital: #F8D9D9;
-@industrial: #E4E2EB;
-@sport0: #DDD9B0;
-@sport1: #D7D3AC;
-@sport2: #D1CDA7;
-@parking: #F2F2BC;
-@military: #E53935;
+@pedestrian_area: #F7EAD8;
+@pedestrian_area_light: #F7EBD9;
+@university: #F8E3C2;
+@hospital: #FFDAD6;
+@industrial: #E8E6E1;
+@sport0: #F5EED3;
+@sport1: #E8E8C3;
+@sport2: #D4E796;
+@parking: #F6F0E9;
+@military: #E22520;
@prison: #727272;
-@farmland: #E4DEAD;
-@farmyard: #E5D6AC;
+@farmland: #E4E0AD;
+@farmyard: #E6D6AF;
/*4.2 Aerodrome*/
-@aerodrome0: #D4BFF2;
-@aerodrome1: #D4BFF2;
-@aerodrome2: #D1C0EB;
-@aerodrome3: #CFC1E8;
-@aerodrome4: #CDC0E3;
-@aerodrome5: #C8BCDE;
+@aerodrome0: #CED4D2;
+@aerodrome1: #CED4D2;
+@aerodrome2: #CBD1CF;
+@aerodrome3: #C6CCCA;
+@aerodrome4: #C4C9C8;
+@aerodrome5: #C1C7C5;
/* 4.3 Barriers */
@fence: #888888;
-@hedge: #8DB880;
+@hedge: #95A852;
@cliff: #8C5826;
/* 4.4 Buildings */
-@building0: #C9C8BB;
-@building1: #C2C0B3;
+@building0: #D5D6D2;
+@building1: #D0D1CC;
@building_border0: #A1A096;
@building_border1: #9B9A8F;
/* 5.ROADS */
/* 5.1 All roads */
-@trunk0: #FF7326;
-@trunk1: #FF7A26;
-@primary0: #FF8726;
-@primary1: #FF9440;
-@primary2: #FFA14C;
-@secondary0: #FFB226;
-@secondary1: #FFBF52;
+@motorway0: #F07800;
+@motorway1: #F08800;
+@trunk0: #F2A62B;
+@trunk1: #F5A72C;
+@primary0: #F5B64C;
+@primary1: #F5BE62;
+@primary2: #F5BD5F;
+@secondary0: #F9C469;
+@secondary1: #F9CA7A;
@tertiary: #FFFFFF;
-@residential: #F8F8F8;
-@pedestrian: #F8F8F8;
-@footway: #F8F8F8;
-@cycleway: #5654FF;
-@construction: #BBBBAA;
+@residential: #FFFFFF;
+@pedestrian: #FFFAF5;
+@footway: #FFFAF5;
+@cycleway: #FFB88B;
+@construction: #C1A06B;
@track: #635730;
-@path: #A05012;
+@path: #8E4E1D;
@path_expert: #3D2617;
@bridleway: #3D361E;
/* 5.2 Bridges */
-@bridge_background: #EDEBDB;
-@bridge_casing: #808080;
+@bridge_background: #FCF1DE;
+@bridge_casing: #E1D4BE;
/* 5.3 Tunnels */
-@trunk_tunnel: #FCA462;
+@motorway_tunnel: #F2A540;
+@motorway_tunnel_casing: #808080;
+@trunk_tunnel: #F6BB5F;
@trunk_tunnel_casing: #808080;
-@primary_tunnel: #FCA462;
+@primary_tunnel: #F6CB85;
@primary_tunnel_casing: #808080;
-@secondary_tunnel: #FFBF52;
+@secondary_tunnel: #F9D393;
@secondary_tunnel_casing: #808080;
@tertiary_tunnel: #FFFFFF;
@tertiary_tunnel_casing: #808080;
@@ -149,15 +153,15 @@
/* 5.5 Transport */
-@railway_light: #B2B1A2;
-@railway: #969586;
+@railway_light: #B0B1A4;
+@railway: #96968B;
@railway_tourism: #9C7D65;
@railway_dash: #EEEEEE;
@railway_tunnel: #808080;
@aerialway: #444444;
@powerline: #969586;
@tram: #7A7A7A;
-@ferry: #4499Bb;
+@ferry: #59A2AF;
/* 6.LABELS COLORS */
/* 6.1 Main labels */
@@ -169,7 +173,7 @@
/* 6.2 Natural labels */
-@water_label: #4499Bb;
+@water_label: #1D8EA4;
@park_label: #3A7921;
@halo_park_label: #FFFFFF;
diff --git a/data/styles/default/light/symbols/bar-m.svg b/data/styles/default/light/symbols/bar-m.svg
index 7e412d12d..cd3649b5b 100644
--- a/data/styles/default/light/symbols/bar-m.svg
+++ b/data/styles/default/light/symbols/bar-m.svg
@@ -3,7 +3,7 @@
-
+
diff --git a/data/styles/default/light/symbols/cafe-m.svg b/data/styles/default/light/symbols/cafe-m.svg
index e9b3d47fb..e6335e9b0 100644
--- a/data/styles/default/light/symbols/cafe-m.svg
+++ b/data/styles/default/light/symbols/cafe-m.svg
@@ -3,7 +3,7 @@
-
+
diff --git a/data/styles/default/light/symbols/fastfood-m.svg b/data/styles/default/light/symbols/fastfood-m.svg
index 86ba8e7a9..94a0ed5ca 100644
--- a/data/styles/default/light/symbols/fastfood-m.svg
+++ b/data/styles/default/light/symbols/fastfood-m.svg
@@ -3,7 +3,7 @@
-
+
diff --git a/data/styles/default/light/symbols/ice_cream-m.svg b/data/styles/default/light/symbols/ice_cream-m.svg
index 8bc88d071..f896fb05b 100644
--- a/data/styles/default/light/symbols/ice_cream-m.svg
+++ b/data/styles/default/light/symbols/ice_cream-m.svg
@@ -1,6 +1,6 @@
diff --git a/data/styles/default/light/symbols/nightclub-m.svg b/data/styles/default/light/symbols/nightclub-m.svg
index e51dd17c1..9e999bcfe 100644
--- a/data/styles/default/light/symbols/nightclub-m.svg
+++ b/data/styles/default/light/symbols/nightclub-m.svg
@@ -1,5 +1,5 @@
diff --git a/data/styles/default/light/symbols/pub-m.svg b/data/styles/default/light/symbols/pub-m.svg
index ca415f4f5..d52dc7dcc 100644
--- a/data/styles/default/light/symbols/pub-m.svg
+++ b/data/styles/default/light/symbols/pub-m.svg
@@ -3,7 +3,7 @@
-
+
diff --git a/data/styles/default/light/symbols/restaurant-m.svg b/data/styles/default/light/symbols/restaurant-m.svg
index 4577d63c8..880ea68c6 100644
--- a/data/styles/default/light/symbols/restaurant-m.svg
+++ b/data/styles/default/light/symbols/restaurant-m.svg
@@ -3,7 +3,7 @@
-
+
diff --git a/data/styles/default/light/symbols/stripclub-m.svg b/data/styles/default/light/symbols/stripclub-m.svg
index dc929476b..cd8ee49c0 100644
--- a/data/styles/default/light/symbols/stripclub-m.svg
+++ b/data/styles/default/light/symbols/stripclub-m.svg
@@ -1,6 +1,6 @@