diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index 5271f707a..5379f720d 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -26,7 +26,8 @@
 
 /* 1.BASEMAP */
 
-@background: #000000;
+@background0: #000000;
+@background1: #000000;
 
 /* 2.BOUNDARY */
 
@@ -50,6 +51,7 @@
 /*3.2 Vegetation*/
 
 @forest: #141C00;
+@heath: #0F1400;
 @green0: #0F1400;
 @green1: #131900;
 @green1b: #141C00;
@@ -71,6 +73,7 @@
 @sport0: #21211B;
 @sport1: #262620;
 @sport2: #2A2A24;
+@playground: #2A2A24;
 @parking: #1F1B1B;
 @military: #B71C1C;
 @prison: #7f7f7f;
@@ -97,10 +100,13 @@
 @building1: #424242;
 @building_border0: #616161;
 @building_border1: #696969;
+@historic_wall: #696969;
 
 /* 5.ROADS */
 /* 5.1 All roads */
 
+@motorway0: #3B2015;
+@motorway1: #3B2015;
 @trunk0: #49291B;
 @trunk1: #49291B;
 @primary0: #593323;
@@ -126,6 +132,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..cec886685 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -38,9 +38,13 @@ area|z10-[place=islet]
 area|z0-[natural=coastline]
 {fill-color: @water;}
 
-area|z0-[natural=land],
-area|z10-[place=islet]
-{fill-color: @background;}
+area|z0-15[natural=land],
+area|z10-15[place=islet],
+{fill-color: @background0;}
+
+area|z16-[natural=land],
+area|z16-[place=islet],
+{fill-color: @background1;}
 
 /* 3.BOUNDARIES */
 
@@ -116,8 +120,9 @@ area|z10-12[leisure=park],
 {fill-color: @green0;}
 area|z13-15[leisure=park],
 {fill-color: @green1;}
-area|z16-[leisure=park],
 area|z14-15[natural=scrub],
+{fill-color: @green1;}
+area|z16-[leisure=park],
 {fill-color: @green2;}
 area|z16-[natural=scrub],
 {fill-color: @green3;}
@@ -131,7 +136,6 @@ area|z16-[landuse=grass],
 area|z14-15[natural=grassland],
 area|z14-[leisure=golf_course],
 area|z14-[leisure=miniature_golf],
-area|z14-[natural=heath],
 area|z14-[landuse=allotments],
 area|z14-[landuse=orchard],
 area|z14-[landuse=plant_nursery],
@@ -141,10 +145,11 @@ area|z14-[landuse=recreation_ground],
 area|z14-[landuse=village_green],
 area|z14-[landuse=field],
 {fill-color: @green1;}
+area|z11[landuse=forest],
 area|z16-[natural=grassland],
 area|z16-[landuse=meadow],
 {fill-color: @green1b;}
-area|z11-12[landuse=forest],
+area|z12[landuse=forest],
 area|z12[leisure=garden],
 {fill-color: @green2;}
 area|z13[landuse=forest],
@@ -167,10 +172,11 @@ area|z16-[leisure=garden][garden:type=residential],
 area|z17-[leisure=garden][garden:type=residential],
 {fill-color: @green2;}
 
+area|z12-[natural=heath],
+{fill-color: @heath;}
 area|z12-13[landuse=grass],
 area|z12-13[natural=grassland],
 area|z12-13[leisure=golf_course],
-area|z12-13[natural=heath],
 area|z12-13[landuse=allotments],
 area|z12-13[landuse=orchard],
 area|z12-13[landuse=plant_nursery],
@@ -363,6 +369,9 @@ area|z16-[railway=platform],
 area|z16-[leisure=playground],
 {fill-opacity: 1;}
 
+area|z15-[amenity=university],
+{fill-opacity: 0.9;}
+
 /* 7.1 Industrial */
 
 area|z15-[landuse=industrial],
@@ -390,9 +399,11 @@ area|z15-[landuse=education],
 
 area|z15-[leisure=pitch],
 area|z15-[leisure=track][area?],
-area|z16-[leisure=playground],
 {fill-color: @sport2;}
 
+area|z16-[leisure=playground],
+{fill-color: @playground;}
+
 area|z15-[leisure=stadium]
 {fill-color: @sport1;}
 
@@ -459,8 +470,11 @@ area|z15-19[aeroway=aerodrome]
 
 /* 7.7 Religion */
 
-area|z15-[landuse=churchyard]
-{fill-color: @background;}
+area|z15[landuse=churchyard],
+{fill-color: @background0;}
+
+area|z16-[landuse=churchyard],
+{fill-color: @background1;}
 
 /* 7.8 Agricultural */
 area|z10-[landuse=farmland],
@@ -484,17 +498,24 @@ area|z15-16[amenity=parking][parking=street_side],
 
 /* 8.1 Pier, dam, areal bridge, cutline */
 
-area|z12-[man_made=pier],
-area|z12-[man_made=breakwater],
-{fill-opacity: 1; fill-color: @background;}
+area|z12-15[man_made=pier],
+area|z12-15[man_made=breakwater],
+{fill-opacity: 1; fill-color: @background0;}
+
+area|z16-[man_made=pier],
+area|z16-[man_made=breakwater],
+{fill-opacity: 1; fill-color: @background1;}
 
 area|z14-[man_made=bridge],
 {fill-color: @bridge_background; fill-opacity: 0.8;}
 
+line|z14-15[man_made=pier],
+line|z14-15[man_made=breakwater],
+{width: 1.5;color: @background0; opacity: 0.7;}
 
-line|z14-[man_made=pier],
-line|z14-[man_made=breakwater],
-{width: 1.5;color: @background; opacity: 0.7;}
+line|z16-[man_made=pier],
+line|z16-[man_made=breakwater],
+{width: 1.5;color: @background1; opacity: 0.7;}
 
 line|z14-[waterway=dam],
 line|z14-[waterway=weir],
@@ -548,11 +569,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],
@@ -605,13 +626,13 @@ line|z19-[barrier=hedge],
 
 line|z14-[barrier=city_wall],
 line|z14-[historic=citywalls],
-{color: @building1; width: 2; opacity: 0.7;}
+{color: @historic_wall; width: 2; opacity: 0.9;}
 line|z15[barrier=city_wall],
 line|z15[historic=citywalls],
 {width: 2.8;}
 line|z16-[barrier=city_wall],
 line|z16-[historic=citywalls],
-{color: @building0; width: 4.5; dashes: 3,3,1.5,3;}
+{width: 4.5; dashes: 3,3,1.5,3;}
 line|z17[barrier=city_wall],
 line|z17[historic=citywalls],
 {width: 5.9; dashes: 4,4,1.9,4;}
@@ -656,7 +677,7 @@ line|z18-[barrier=retaining_wall],
 
 
 line|z16-[man_made=embankment],
-{color: @building1; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;}
+{color: @building_border0; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;}
 line|z17[man_made=embankment],
 {width: 5; dashes: 6,3,3,2;}
 line|z18-[man_made=embankment],
diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss
index 6fd441ae8..fc8918475 100644
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -33,7 +33,7 @@
   8.7 Footway 15-22 ZOOM
   8.8 Steps 15-22 ZOOM
   8.9 Bridleway 14-22 ZOOM
-  8.11 Runway 12-22 ZOOM
+  8.10 Runway 12-22 ZOOM
 9.RAIL 11-22 ZOOM
   9.1 RAIL 11-22 ZOOM
   9.2 Rail tunnel 14-22 ZOOM
@@ -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,20 +73,24 @@ 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],
+line|z6-9[highway=motorway],
+line|z6-9[highway=trunk],
+{color: @trunk0; opacity: 0.6;}
 line|z7-9[highway=motorway],
-{color: @trunk0; opacity: 0.7;}
+line|z7-9[highway=trunk],
+{opacity: 0.8;}
 
-line|z10-[highway=trunk],
-line|z10-[highway=motorway],
-{color: @trunk1; opacity: 0.7;}
+line|z10-13[highway=motorway],
+{color: @motorway0; opacity: 1;}
+line|z10-13[highway=trunk],
+{color: @trunk1; opacity: 1;}
+line|z14-[highway=motorway],
+{color: @motorway1;}
+line|z14-[highway=trunk],
+{color: @trunk1; opacity: 0.9;}
 line|z10-[highway=motorway_link],
 line|z10-[highway=trunk_link],
 {color: @primary0; opacity: 0.7;}
-line|z13-14[highway=trunk],
 line|z13-14[highway=motorway],
 line|z14-15[highway=motorway_link],
 line|z14-15[highway=trunk_link],
@@ -110,85 +114,97 @@ line|z14-[highway=trunk_link][bridge?]::bridgeblack,
 
 /* 3.1 Trunk & Motorway 6-22 ZOOM */
 
-line|z6[highway=trunk],
-line|z6[highway=motorway],
-{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|z10[highway=motorway],
+{width: 2.6;}
+line|z11[highway=motorway],
+{width: 3.0;}
+line|z12[highway=motorway],
+{width: 3.6;}
 line|z13[highway=motorway],
-{width: 2.8;}
-line|z14[highway=trunk],
+{width: 4.0;}
 line|z14[highway=motorway],
-{width: 3.8;}
-line|z15[highway=trunk],
-line|z15[highway=motorway],
 {width: 4.4;}
-line|z16[highway=trunk],
+line|z15[highway=motorway],
+{width: 5.6;}
 line|z16[highway=motorway],
-{width: 6;}
-line|z17[highway=trunk],
+{width: 7.8;}
 line|z17[highway=motorway],
+{width: 9.0;}
+line|z18[highway=motorway],
+{width: 12.0;}
+line|z19-[highway=motorway],
+{width: 16.0;}
+
+line|z6[highway=motorway],
+line|z6[highway=trunk],
+{width: 0.8;}
+line|z7[highway=motorway],
+line|z7[highway=trunk],
+{width: 0.9;}
+line|z8[highway=motorway],
+line|z8[highway=trunk],
+{width: 1.2;}
+line|z9[highway=motorway],
+line|z9[highway=trunk],
+{width: 1.3;}
+line|z10[highway=trunk],
+{width: 2.2;}
+line|z11[highway=trunk],
+{width: 2.5;}
+line|z12[highway=trunk],
+{width: 3.0;}
+line|z13[highway=trunk],
+{width: 3.6;}
+line|z14[highway=trunk],
+{width: 4.0;}
+line|z15[highway=trunk],
+{width: 4.8;}
+line|z16[highway=trunk],
+{width: 6.2;}
+line|z17[highway=trunk],
 {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],
 line|z10[highway=trunk_link]
-{width: 0.8;}
+{width: 0.9;}
 line|z11[highway=motorway_link],
 line|z11[highway=trunk_link]
-{width: 1.0;}
+{width: 1.1;}
 line|z12[highway=motorway_link],
 line|z12[highway=trunk_link]
-{width: 1.3;}
+{width: 1.4;}
 line|z13[highway=motorway_link],
 line|z13[highway=trunk_link]
-{width: 1.8;}
+{width: 1.9;}
 line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
-{width: 2.6;}
+{width: 2.7;}
 line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
-{width: 3.6;}
+{width: 3.7;}
 line|z16[highway=motorway_link],
 line|z16[highway=trunk_link]
-{width: 5;}
+{width: 5.1;}
 line|z17[highway=motorway_link],
 line|z17[highway=trunk_link]
-{width: 6.6;}
+{width: 6.7;}
 line|z18[highway=motorway_link],
 line|z18[highway=trunk_link]
-{width: 9.4;}
+{width: 9.5;}
 line|z19-[highway=motorway_link],
 line|z19-[highway=trunk_link]
-{width: 11.6;}
+{width: 11.7;}
 
 /* 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 +262,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: @primary0; opacity: 0.8;}
+line|z11-13[highway=primary],
+line|z11-13[highway=primary_link]
+{color: @primary1; opacity: 1;}
+line|z14-[highway=primary],
+line|z14-[highway=primary_link],
 {color: @primary2; opacity: 1;}
 
 line|z14-[highway=primary][bridge?]::bridgewhite,
@@ -272,25 +284,26 @@ line|z8[highway=primary],
 line|z9[highway=primary],
 {width: 0.8;}
 line|z10[highway=primary],
-{width: 1.2;}
+{width: 1.8;}
 line|z11[highway=primary],
-{width: 1.5;}
-line|z12[highway=primary],
-{width: 1.7;}
-line|z13[highway=primary],
 {width: 2.3;}
+line|z12[highway=primary],
+{width: 2.7;}
+line|z13[highway=primary],
+{width: 3.0;}
 line|z14[highway=primary],
-{width: 3.2;}
-line|z15[highway=primary],
 {width: 3.8;}
+line|z15[highway=primary],
+{width: 4.4;}
 line|z16[highway=primary],
-{width: 5;}
+{width: 5.4;}
 line|z17[highway=primary],
-{width: 6.6;}
+{width: 7;}
 line|z18[highway=primary],
-{width: 9.4;}
+{width: 10;}
 line|z19-[highway=primary],
-{width: 11.6;}
+{width: 12;}
+
 
 line|z11[highway=primary_link],
 {width: 0.8;}
@@ -348,13 +361,11 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack,
 
 /* 5.SECONDARY 10-22 ZOOM */
 
-line|z10-12[highway=secondary],
-{color: @secondary0; opacity: 0.8;}
-line|z13-14[highway=secondary],
-line|z13-14[highway=secondary_link],
-{color: @secondary1; opacity: 0.9;}
-line|z15-[highway=secondary],
-line|z15-[highway=secondary_link],
+line|z10-13[highway=secondary],
+line|z13[highway=secondary_link],
+{color: @secondary0; opacity: 1;}
+line|z14-[highway=secondary],
+line|z14-[highway=secondary_link],
 {color: @secondary1; opacity: 1;}
 
 line|z14-[highway=secondary][bridge?]::bridgewhite,
@@ -367,13 +378,13 @@ line|z14-[highway=secondary_link][bridge?]::bridgeblack,
 /* 5.1 Secondary 10-22 ZOOM */
 
 line|z10[highway=secondary],
-{width: 1.2;}
+{width: 1.4;}
 line|z11[highway=secondary],
-{width: 1.5;}
+{width: 2.2;}
 line|z12[highway=secondary],
-{width: 1.7;}
+{width: 2.5;}
 line|z13[highway=secondary],
-{width: 2.3;}
+{width: 2.7;}
 line|z14[highway=secondary],
 {width: 3.2;}
 line|z15[highway=secondary],
@@ -433,17 +444,23 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack
 /* 6.TERTIARY & UNCLASSIFIED 11-22 ZOOM */
 
 line|z11-[highway=tertiary],
-line|z11-[highway=unclassified],
+{color: @tertiary; opacity: 1;}
+line|z12-13[highway=tertiary],
+{opacity: 0.95;}
 line|z14-[highway=tertiary_link],
-{color: @tertiary; opacity: 0.7;}
+{color: @tertiary; opacity: 1;}
+line|z11-[highway=unclassified],
+{color: @tertiary; opacity: 0.95;}
+line|z12-15[highway=unclassified],
+{opacity: 0.8;}
 line|z14-15[highway=tertiary],
-line|z14-15[highway=unclassified],
 line|z15-16[highway=tertiary_link],
-{opacity: 0.85;}
+{opacity: 0.9;}
 line|z16-[highway=tertiary],
-line|z16-[highway=unclassified],
 line|z17-[highway=tertiary_link],
 {opacity: 1;}
+line|z16-[highway=unclassified],
+{opacity: 0.9;}
 
 line|z14-[highway=tertiary][bridge?]::bridgewhite,
 line|z14-[highway=tertiary_link][bridge?]::bridgewhite
@@ -457,31 +474,22 @@ line|z14-[highway=unclassified][bridge?]::bridgeblack,
 /* 6.1 Tertiary & Unclassified 11-22 ZOOM */
 
 line|z11[highway=tertiary],
-line|z11[highway=unclassified],
-{width: 0.8;}
+{width: 1.2;}
 line|z12[highway=tertiary],
-line|z12[highway=unclassified],
-{width: 1.3;}
+{width: 1.6;}
 line|z13[highway=tertiary],
-line|z13[highway=unclassified],
 {width: 1.8;}
 line|z14[highway=tertiary],
-line|z14[highway=unclassified],
 {width: 2.7;}
 line|z15[highway=tertiary],
-line|z15[highway=unclassified],
 {width: 3.8;}
 line|z16[highway=tertiary],
-line|z16[highway=unclassified],
 {width: 5;}
 line|z17[highway=tertiary],
-line|z17[highway=unclassified],
 {width: 6.6;}
 line|z18[highway=tertiary],
-line|z18[highway=unclassified],
 {width: 9.4;}
 line|z19-[highway=tertiary],
-line|z19-[highway=unclassified],
 {width: 11.6;}
 
 line|z14[highway=tertiary_link],
@@ -497,6 +505,25 @@ line|z18[highway=tertiary_link],
 line|z19-[highway=tertiary_link],
 {width: 8.2;}
 
+line|z11[highway=unclassified],
+{width: 0.6;}
+line|z12[highway=unclassified],
+{width: 1.0;}
+line|z13[highway=unclassified],
+{width: 1.4;}
+line|z14[highway=unclassified],
+{width: 2.3;}
+line|z15[highway=unclassified],
+{width: 3.2;}
+line|z16[highway=unclassified],
+{width: 4.2;}
+line|z17[highway=unclassified],
+{width: 6;}
+line|z18[highway=unclassified],
+{width: 8;}
+line|z19-[highway=unclassified],
+{width: 10;}
+
 /* 6.2 Tertiary & Unclassified tunnel 16-22 ZOOM */
 
 line|z16-[highway=tertiary][tunnel?],
@@ -537,10 +564,10 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack,
 line|z12-[highway=residential],
 line|z12-[highway=road],
 line|z12-[highway=living_street],
-{color: @residential; opacity: 0.7;}
-line|z14-16[highway=residential],
-line|z14-16[highway=road],
-line|z14-16[highway=living_street],
+{color: @residential; opacity: 0.8;}
+line|z13-16[highway=residential],
+line|z13-16[highway=road],
+line|z13-16[highway=living_street],
 {opacity: 0.85;}
 line|z17-[highway=residential],
 line|z17-[highway=road],
@@ -614,7 +641,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,13 +670,15 @@ 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|z13-[highway=construction],
-{color: @construction;opacity: 0.7;}
+{color: @construction;opacity: 0.8;}
 line|z13-[highway=pedestrian][bridge?]::bridgewhite,
 line|z15-[highway=footway][bridge?]::bridgewhite,
 line|z15-[highway=cycleway][bridge?]::bridgewhite,
@@ -679,9 +708,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.87;}
 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 +740,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,51 +786,57 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
 /* 8.4 Cycleway 13-22 ZOOM */
 
 line|z13[highway=cycleway],
-{opacity: 0.3;}
-line|z14[highway=cycleway],
-line|z14[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.4;}
-line|z15[highway=cycleway],
-line|z15[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.5;}
-line|z16-17[highway=cycleway],
-line|z16-17[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.6;}
-line|z18-[highway=cycleway],
-line|z18-[highway=path][bicycle=designated]::cycleline,
+{opacity: 0.7;}
+line|z14-16[highway=cycleway],
 {opacity: 0.8;}
+line|z17-18[highway=cycleway],
+{opacity: 0.9;}
+line|z19-[highway=cycleway],
+{opacity: 1;}
 
-line|z15-16[highway=footway][bicycle=designated]::cycleline,
-{opacity: 0.4;}
-line|z17-[highway=footway][bicycle=designated]::cycleline,
-{opacity: 0.5;}
+line|z14-[highway=path][bicycle=designated]::cycleline,
+line|z15-[highway=footway][bicycle=designated]::cycleline,
+{opacity: 1;}
 
 line|z13[highway=cycleway]
-{width: 0.9;}
+{width: 1.0;}
 line|z14[highway=cycleway],
-line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.1;}
-line|z15[highway=cycleway]
-line|z15[highway=footway][bicycle=designated]::cycleline,
-line|z15[highway=path][bicycle=designated]::cycleline,
 {width: 1.2;}
+line|z15[highway=cycleway],
+{width: 1.5;}
 line|z16[highway=cycleway],
-line|z16[highway=footway][bicycle=designated]::cycleline,
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 1.3;}
+{width: 2;}
 line|z17[highway=cycleway],
-line|z17[highway=footway][bicycle=designated]::cycleline,
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 1.4;}
+{width: 2.4;}
 line|z18[highway=cycleway],
-line|z18[highway=footway][bicycle=designated]::cycleline,
-line|z18[highway=path][bicycle=designated]::cycleline,
-{width: 1.6;}
+{width: 3.2;}
 line|z19-[highway=cycleway],
-line|z19-[highway=footway][bicycle=designated]::cycleline,
+{width: 4.2;}
+
+line|z14[highway=path][bicycle=designated]::cycleline,
+{width: 0.5;}
+line|z15[highway=path][bicycle=designated]::cycleline,
+{width: 0.6;}
+line|z16[highway=path][bicycle=designated]::cycleline,
+{width: 1.2;}
+line|z17[highway=path][bicycle=designated]::cycleline,
+{width: 1;}
+line|z18[highway=path][bicycle=designated]::cycleline,
+{width: 1.4;}
 line|z19-[highway=path][bicycle=designated]::cycleline,
 {width: 1.8;}
 
+line|z15[highway=footway][bicycle=designated]::cycleline,
+{width: 0.7;}
+line|z16[highway=footway][bicycle=designated]::cycleline,
+{width: 0.8;}
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{width: 1.1;}
+line|z18[highway=footway][bicycle=designated]::cycleline,
+{width: 1.4;}
+line|z19-[highway=footway][bicycle=designated]::cycleline,
+{width: 2.0;}
+
 line|z17[highway=cycleway][tunnel?]::tunnelBackground
 {casing-width-add: 1;}
 line|z18[highway=cycleway][tunnel?]::tunnelBackground
@@ -953,26 +988,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: 6,9; opacity: 0.8;}
 line|z16[highway=footway][bicycle=designated],
-{width: 2; dashes: 5,3;}
+{width: 2; dashes: 8,10; opacity: 0.9;}
 line|z17[highway=footway][bicycle=designated],
-{width: 2.4; dashes: 6,4.2; opacity: 0.9;}
+{width: 2.4; dashes: 10,11; opacity: 1;}
 line|z18[highway=footway][bicycle=designated],
-{width: 3.2; dashes: 8,5.5; opacity: 1;}
+{width: 3.2; dashes: 15,15; opacity: 1;}
 line|z19-[highway=footway][bicycle=designated],
-{width: 4.2; dashes: 10,6.7; opacity: 1;}
+{width: 4.2; dashes: 20,20; opacity: 1;}
 
 /* Don't display sidewalks and pedestrian crossings on z15. */
 line|z15[highway=footway][footway=sidewalk],
@@ -1051,7 +1086,7 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite
 line|z17-[highway=bridleway][bridge?]::bridgeblack
 {casing-width-add: 1;}
 
-/* 8.11 Runway 12-22 ZOOM */
+/* 8.10 Runway 12-22 ZOOM */
 
 line|z12-[aeroway=runway],
 line|z14-[aeroway=taxiway],
@@ -1068,8 +1103,10 @@ line|z16-[aeroway=runway]
 
 line|z14[aeroway=taxiway]
 {width: 0.6; opacity: 0.4;}
-line|z15-[aeroway=taxiway]
-{width: 1.2; opacity: 0.5;}
+line|z15[aeroway=taxiway]
+{width: 1.2; opacity: 0.3;}
+line|z16-[aeroway=taxiway]
+{width: 1.2; opacity: 0.4;}
 
 /* 9.RAIL 11-22 ZOOM */
 
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 46230d9b0..8acf9e7a7 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,15 +188,22 @@ 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-)
-=== 222
+=== 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-)
-# === 221
+=== 222
 
 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-)
@@ -218,8 +221,21 @@ railway-rail-utility-bridge::dash                   # line::dash z17- (also has
 railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
 railway-subway::dash                                # line::dash z16- (also has line z13-)
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+=== 221
+
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
+highway-path-bicycle                                # line z14- (also has line::cycleline z14-, pathtext z15-)
 === 220
 
+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-)
+=== 219
+
+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-)
+=== 218
+
 railway-light_rail                                  # line z13- (also has line::dash z16-)
 railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
 railway-rail                                        # line z11- (also has line::dash z16-)
@@ -254,25 +270,13 @@ 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-)
-=== 190
-
 highway-bridleway                                   # line z14- (also has pathtext z15-)
 highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 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-)
 highway-path-expert                                 # line z14- (also has pathtext z15-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
@@ -283,10 +287,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..0abe830f9 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,8 @@
 
 /* 1.BASEMAP */
 
-@background: #E3E1D2;
+@background0: #F5E8D6;
+@background1: #F5EADA;
 
 /* 2.BOUNDARY */
 
@@ -38,103 +39,110 @@
 /* 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: #C3E0D1;
+@beach: #FADDA0;
 @barerock: #D9D2BF;
 @scree: #CCC7BA;
-@desert: #EEE5B2;
+@desert: #F4E5C8;
 
 /*3.2 Vegetation*/
 
-@green0: #CFD5A8;
-@green1: #C6CF93;
-@green1b: #C1CC89;
-@green2: #BCC87E;
-@green3: #B3C471;
-@green4: #AEC26B;
-@green5: #B0C270;
-@forest: #AABF65;
-@green6: #888C38;
-@flowers: #B3C471;
+@heath: #CED797;
+@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: #F7EDDF;
+@pedestrian_area_light: #FAF0E2;
+@university: #F5DFBC;
+@hospital: #FFDAD6;
+@industrial: #E5E5E4;
+@sport0: #F5EED3;
+@sport1: #E8E8C3;
+@sport2: #D4E796;
+@playground: #E4E7A2;
+@parking: #E8EFEC;
+@military: #DE2D28;
 @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: #A1B3BE;
+@aerodrome1: #A1B3BE;
+@aerodrome2: #A1B3BE;
+@aerodrome3: #A1B3BE;
+@aerodrome4: #8BABBE;
+@aerodrome5: #82A3B7;
 
 /* 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;
+@historic_wall: #AEAD9E;
 
 /* 5.ROADS */
 /* 5.1 All roads */
 
-@trunk0: #FF7326;
-@trunk1: #FF7A26;
-@primary0:  #FF8726;
-@primary1: #FF9440;
-@primary2: #FFA14C;
-@secondary0: #FFB226;
-@secondary1: #FFBF52;
+@motorway0: #F57A00;
+@motorway1: #F08800;
+@trunk0: #F29718;
+@trunk1: #F29E30;
+@primary0: #F5B74E;
+@primary1: #FABB40;
+@primary2: #FAC256;
+@secondary0: #FFCE5A;
+@secondary1: #FFD573;
 @tertiary: #FFFFFF;
-@residential: #F8F8F8;
-@pedestrian: #F8F8F8;
-@footway: #F8F8F8;
-@cycleway: #5654FF;
-@construction: #BBBBAA;
+@residential: #FFFEFE;
+@pedestrian: #FFFAF5;
+@footway: #FFFAF5;
+@cycleway: #8B8AFF;
+@construction: #B2B8C8;
 @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;
-@residential_tunnel: #FFFFFF;
+@residential_tunnel: #FFFEFE;
 @residential_tunnel_casing: #808080;
 
 /* 5.4 Piste */
@@ -149,15 +157,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 +177,7 @@
 
 /* 6.2 Natural labels */
 
-@water_label: #4499Bb;
+@water_label: #278FA2;
 @park_label: #3A7921;
 @halo_park_label: #FFFFFF;
 
diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss
index 026dd144e..ab16d9794 100644
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -103,10 +103,9 @@ line|z11-[highway=bridleway],
 {color: @path; opacity: 1;}
 
 line|z11-[highway=cycleway],
+line|z13-[highway=footway][bicycle=designated]::cycleline,
 line|z12-[highway=path][bicycle=designated]::cycleline,
 {color: @cycleway; opacity: 1;}
-line|z13-[highway=footway][bicycle=designated]::cycleline,
-{color: @cycleway; opacity: 0.8;}
 
 line|z11[highway=track],
 {width: 1.1; dashes: 6,2.5; opacity: 0.6;}
@@ -168,27 +167,37 @@ line|z13-[highway=footway][bicycle=designated],
 {opacity: 0.8;}
 
 line|z12[highway=path][bicycle=designated],
-line|z12[highway=footway][bicycle=designated],
 {width: 1.1; dashes: 3.5,2.5; opacity: 0.7;}
 line|z13[highway=path][bicycle=designated],
-line|z13[highway=footway][bicycle=designated],
 {width: 1.3; dashes: 4,3;}
 line|z14[highway=path][bicycle=designated],
-line|z14[highway=footway][bicycle=designated],
 {width: 1.6; dashes: 4,3;}
 line|z15[highway=path][bicycle=designated],
-line|z15[highway=footway][bicycle=designated],
 {width: 2; dashes: 6,4.5;}
 line|z16[highway=path][bicycle=designated],
-line|z16[highway=footway][bicycle=designated],
-{width: 2.6; dashes: 6,4.5;}
+{width: 2.6; dashes: 6,4.5; opacity: 0.9;}
 line|z17[highway=path][bicycle=designated],
-line|z17[highway=footway][bicycle=designated],
-{width: 3.3; dashes: 8,6;}
+{width: 3.3; dashes: 8,6; opacity: 1;}
 line|z18-[highway=path][bicycle=designated],
-line|z18-[highway=footway][bicycle=designated],
 {width: 4; dashes: 8,6; opacity: 1;}
 
+line|z12[highway=footway][bicycle=designated],
+{width: 1.1; dashes: 2,6; opacity: 0.7;}
+line|z13[highway=footway][bicycle=designated],
+{width: 1.3; dashes: 3,7;}
+line|z14[highway=footway][bicycle=designated],
+{width: 1.6; dashes: 4,8;}
+line|z15[highway=footway][bicycle=designated],
+{width: 2; dashes: 6,9;}
+line|z16[highway=footway][bicycle=designated],
+{width: 2.6; dashes: 8,10; opacity: 0.9;}
+line|z17[highway=footway][bicycle=designated],
+{width: 3.3; dashes: 10,11; opacity: 1;}
+line|z18[highway=footway][bicycle=designated],
+{width: 4; dashes:  15,15; opacity: 1;}
+line|z19-[highway=footway][bicycle=designated],
+{width: 4; dashes: 20,20; opacity: 1;}
+
 line|z11[highway=path][_path_grade=difficult],
 line|z11[highway=path][_path_grade=expert],
 {width: 1; dashes: 1,2; opacity: 0.7;}
@@ -247,32 +256,51 @@ line|z18-[highway=bridleway],
 line|z11[highway=cycleway],
 {width: 0.9; opacity: 0.7;}
 line|z12[highway=cycleway],
-line|z12[highway=path][bicycle=designated]::cycleline,
-{width: 1; opacity: 0.7;}
+{width: 1.1; opacity: 0.7;}
 line|z13[highway=cycleway],
-line|z13[highway=footway][bicycle=designated]::cycleline,
-line|z13[highway=path][bicycle=designated]::cycleline,
-{width: 1.1; opacity: 0.8;}
+{width: 1.3; opacity: 0.8;}
 line|z14[highway=cycleway],
-line|z14[highway=footway][bicycle=designated]::cycleline,
-line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.3;}
+{width: 1.6;}
 line|z15[highway=cycleway],
-line|z15[highway=footway][bicycle=designated]::cycleline,
-line|z15[highway=path][bicycle=designated]::cycleline,
-{width: 1.5;}
-line|z16[highway=cycleway],
-line|z16[highway=footway][bicycle=designated]::cycleline,
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 1.7;}
-line|z17[highway=cycleway],
-line|z17[highway=footway][bicycle=designated]::cycleline,
-line|z17[highway=path][bicycle=designated]::cycleline,
 {width: 2;}
+line|z16[highway=cycleway],
+{width: 2.6;}
+line|z17[highway=cycleway],
+{width: 3.3;}
 line|z18-[highway=cycleway],
-line|z18-[highway=footway][bicycle=designated]::cycleline,
+{width: 4;}
+
+line|z12-[highway=path][bicycle=designated]::cycleline,
+{width: 0.5; opacity: 1;}
+line|z13[highway=path][bicycle=designated]::cycleline,
+{width: 0.6;}
+line|z14[highway=path][bicycle=designated]::cycleline,
+{width: 0.8;}
+line|z15[highway=path][bicycle=designated]::cycleline,
+{width: 1;}
+line|z16[highway=path][bicycle=designated]::cycleline,
+{width: 1.3;}
+line|z17[highway=path][bicycle=designated]::cycleline,
+{width: 1.6;}
 line|z18-[highway=path][bicycle=designated]::cycleline,
-{width: 2.4;}
+{width: 2;}
+
+line|z13-[highway=footway][bicycle=designated]::cycleline,
+{opacity: 1;}
+line|z13[highway=footway][bicycle=designated]::cycleline,
+{width: 0.5;}
+line|z14[highway=footway][bicycle=designated]::cycleline,
+{width: 0.6;}
+line|z15[highway=footway][bicycle=designated]::cycleline,
+{width: 0.7;}
+line|z16[highway=footway][bicycle=designated]::cycleline,
+{width: 0.8;}
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{width: 1.1;}
+line|z18[highway=footway][bicycle=designated]::cycleline,
+{width: 1.4;}
+line|z19-[highway=footway][bicycle=designated]::cycleline,
+{width: 2.0;}
 
 
 /* Ski pistes */
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index c88956085..7fffb81bf 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -47,10 +47,6 @@ power-line::dash                                    # line::dash z13- (also has
 power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340
 
-highway-cycleway                                    # line z11- (also has pathtext z13-)
-highway-cycleway-bridge                             # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-cycleway-tunnel                             # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway-crossing                            # line z16-
 highway-steps                                       # line z12- (also has pathtext z13-)
 highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
@@ -194,15 +190,22 @@ 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-)
-=== 222
+=== 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 z13- (also has pathtext z16-)
+highway-service-area                                # line z13- (also has pathtext z16-)
+highway-service-bridge                              # line z13- (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 z13- (also has pathtext z16-)
 # highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
-# === 221
+=== 222
 
 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-)
@@ -220,8 +223,21 @@ railway-rail-utility-bridge::dash                   # line::dash z16- (also has
 railway-rail-utility-tunnel::dash                   # line::dash z16- (also has line z12-, line(casing) z14-)
 railway-subway::dash                                # line::dash z16- (also has line z13-)
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+=== 221
+
+highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
+highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
 === 220
 
+highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
+highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
+=== 219
+
+highway-cycleway                                    # line z11- (also has pathtext z13-)
+highway-cycleway-bridge                             # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-cycleway-tunnel                             # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+=== 218
+
 railway-light_rail                                  # line z13- (also has line::dash z16-)
 railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
 railway-rail                                        # line z10- (also has line::dash z15-)
@@ -256,25 +272,13 @@ 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 z13- (also has pathtext z16-)
-highway-service-area                                # line z13- (also has pathtext z16-)
-highway-service-bridge                              # line z13- (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 z13- (also has pathtext z16-)
-=== 190
-
 highway-bridleway                                   # line z11- (also has pathtext z13-)
 highway-bridleway-bridge                            # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-bridleway-tunnel                            # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-footway                                     # line z11- (also has pathtext z13-)
 highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
-highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
+highway-footway-crossing                            # line z16-
 highway-path                                        # line z11- (also has pathtext z13-)
-highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
 highway-path-difficult                              # line z11- (also has pathtext z13-)
 highway-path-expert                                 # line z11- (also has pathtext z13-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
@@ -285,10 +289,6 @@ highway-track-no-access                             # line z11- (also has pathte
 highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 === 180
 
-highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
-highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
-=== 170
-
 highway-construction                                # line z11- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
 railway-abandoned                                   # line z13-
diff --git a/data/styles/outdoors/light/colors.mapcss b/data/styles/outdoors/light/colors.mapcss
index 454031ba3..dc5edc8e2 100644
--- a/data/styles/outdoors/light/colors.mapcss
+++ b/data/styles/outdoors/light/colors.mapcss
@@ -34,6 +34,9 @@
 
 @cycleway: #534DEB; /* slightly darker than in main */
 
+@pedestrian: #FFFFFF; /* slightly lighter than in main */
+@footway: #FFFFFF; /* slightly lighter than in main */
+
 @construction: #ABAB9A;
 
 /* 5.5 Transport */