diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 6957c01a8..9563f0e7d 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -612,7 +612,7 @@ line|z15[historic=citywalls],
 {width: 2.8;}
 line|z16-[barrier=city_wall],
 line|z16-[historic=citywalls],
-{cwidth: 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;}
diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss
index f5daee60c..0c2b7aa0d 100644
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -76,20 +76,20 @@ line|z9[highway=world_level]
 line|z6[highway=motorway],
 {color: @motorway0; opacity: 1;}
 line|z6[highway=trunk],
-{color: @trunk1; opacity: 0.6;}
-line|z7-9[highway=motorway],
+{color: @trunk0; opacity: 0.6;}
+line|z7-13[highway=motorway],
 {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.8;}
+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],
-{color: @trunk1; opacity: 0.9;}
 line|z13-14[highway=motorway],
 line|z14-15[highway=motorway_link],
 line|z14-15[highway=trunk_link],
@@ -114,21 +114,21 @@ line|z14-[highway=trunk_link][bridge?]::bridgeblack,
 /* 3.1 Trunk & Motorway 6-22 ZOOM */
 
 line|z6[highway=motorway],
-{width: 0.9;}
+{width: 1.5;}
 line|z7[highway=motorway]
-{width: 1.0;}
+{width: 1.6;}
 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]
+line|z9[highway=motorway]
 {width: 1.8;}
-line|z12[highway=motorway]
+line|z10[highway=motorway]
+{width: 1.9;}
+line|z11[highway=motorway]
 {width: 2.0;}
+line|z12[highway=motorway]
+{width: 2.1;}
 line|z13[highway=motorway],
-{width: 2.9;}
+{width: 3.0;}
 line|z14[highway=motorway],
 {width: 3.9;}
 line|z15[highway=motorway],
@@ -374,13 +374,10 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack,
 
 /* 5.SECONDARY 10-22 ZOOM */
 
-line|z10-12[highway=secondary],
+line|z10-13[highway=secondary],
 {color: @secondary0; opacity: 1;}
-line|z13-14[highway=secondary],
-line|z13-14[highway=secondary_link],
-{color: @secondary1; opacity: 1;}
-line|z15-[highway=secondary],
-line|z15-[highway=secondary_link],
+line|z14-[highway=secondary],
+line|z14-[highway=secondary_link],
 {color: @secondary1; opacity: 1;}
 
 line|z14-[highway=secondary][bridge?]::bridgewhite,
@@ -804,12 +801,12 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
 /* 8.4 Cycleway 13-22 ZOOM */
 
 line|z13[highway=cycleway],
-{opacity: 0.6;}
+{opacity: 0.5;}
 line|z14[highway=cycleway],
 line|z14[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.7;}
+{opacity: 0.6;}
 line|z15[highway=cycleway],
-line|z15[highway=path][bicycle=designated]::cycleline,
+line|z15[highway=imaryath][bicycle=designated]::cycleline,
 {opacity: 0.8;}
 line|z16-17[highway=cycleway],
 line|z16-17[highway=path][bicycle=designated]::cycleline,
@@ -819,9 +816,9 @@ line|z18-[highway=path][bicycle=designated]::cycleline,
 {opacity: 1;}
 
 line|z15-16[highway=footway][bicycle=designated]::cycleline,
-{opacity: 0.6;}
-line|z15-16[highway=footway][bicycle=designated]::cycleline,
-{opacity: 0.7;}
+{opacity: 0.8;}
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{opacity: 0.9;}
 
 line|z13[highway=cycleway]
 {width: 0.9;}
@@ -829,26 +826,32 @@ 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|z16[highway=cycleway],
-line|z16[highway=footway][bicycle=designated]::cycleline,
 line|z16[highway=path][bicycle=designated]::cycleline,
 {width: 1.3;}
 line|z17[highway=cycleway],
-line|z17[highway=footway][bicycle=designated]::cycleline,
 line|z17[highway=path][bicycle=designated]::cycleline,
 {width: 1.4;}
 line|z18[highway=cycleway],
-line|z18[highway=footway][bicycle=designated]::cycleline,
 line|z18[highway=path][bicycle=designated]::cycleline,
 {width: 1.6;}
 line|z19-[highway=cycleway],
-line|z19-[highway=footway][bicycle=designated]::cycleline,
 line|z19-[highway=path][bicycle=designated]::cycleline,
 {width: 1.8;}
 
+line|z15[highway=footway][bicycle=designated]::cycleline,
+{width: 1.5;}
+line|z16[highway=footway][bicycle=designated]::cycleline,
+{width: 2;}
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{width: 2.4;}
+line|z18[highway=footway][bicycle=designated]::cycleline,
+{width: 3.2;}
+line|z19-[highway=footway][bicycle=designated]::cycleline,
+{width: 4.2;}
+
 line|z17[highway=cycleway][tunnel?]::tunnelBackground
 {casing-width-add: 1;}
 line|z18[highway=cycleway][tunnel?]::tunnelBackground
@@ -1021,6 +1024,7 @@ line|z18[highway=footway][bicycle=designated],
 line|z19-[highway=footway][bicycle=designated],
 {width: 4.2; dashes: none; opacity: 1;}
 
+
 /* Don't display sidewalks and pedestrian crossings on z15. */
 line|z15[highway=footway][footway=sidewalk],
 line|z15[highway=footway][footway=crossing],
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 2f3e2a944..d46d40e6f 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -205,9 +205,6 @@ highway-service-tunnel                              # line z15- (also has pathte
 # highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
 === 222
 
-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-)
@@ -224,8 +221,19 @@ 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::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
 === 220
 
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, 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-)
@@ -260,7 +268,6 @@ highway-pedestrian-tunnel                           # line z13- (also has line(c
 # highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
 # === 199
 
-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
 
@@ -269,7 +276,6 @@ highway-bridleway-bridge                            # line z14- (also has line::
 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-)
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index b8440b975..4b659b470 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -668,6 +668,9 @@ highway-residential-bridge::shield                  # shield::shield z15- (also
 highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
+=== 2954
+
 highway-cycleway                                    # pathtext z15- (also has line z13-)
 highway-cycleway-bridge                             # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-cycleway-tunnel                             # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-)
@@ -676,7 +679,6 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 area:highway-footway                                # caption z15- (also has area z14-)
 highway-footway                                     # pathtext z15- (also has line z15-)
 highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
 highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-tertiary_link                               # pathtext z18- (also has line z14-)
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index aadde0a49..02047e872 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -73,7 +73,7 @@
 @sport1: #E8E8C3;
 @sport2: #D4E796;
 @parking: #F6F0E9;
-@military: #E22520;
+@military: #E53935;
 @prison: #727272;
 @farmland: #E4E0AD;
 @farmyard: #E6D6AF;
@@ -104,15 +104,15 @@
 
 @motorway0: #F57A00;
 @motorway1: #F08800;
-@trunk0: #F09D18;
-@trunk1: #F2A327;
+@trunk0: #F29718;
+@trunk1: #F29E30;
 @primary0: #F5B74E;
-@primary1: #F2BA52;
-@primary2: #F2BD5C;
-@secondary0: #FFCB70;
-@secondary1: #F9CA7A;
+@primary1: #FABB40;
+@primary2: #FAC256;
+@secondary0: #FFCE5A;
+@secondary1: #FFD573;
 @tertiary: #FFFFFF;
-@residential: #FFFFFF;
+@residential: #FFFEFE;
 @pedestrian: #FFFAF5;
 @footway: #FFFAF5;
 @cycleway: #605EFE;
@@ -139,7 +139,7 @@
 @secondary_tunnel_casing:  #808080;
 @tertiary_tunnel: #FFFFFF;
 @tertiary_tunnel_casing:  #808080;
-@residential_tunnel: #FFFFFF;
+@residential_tunnel: #FFFEFE;
 @residential_tunnel_casing: #808080;
 
 /* 5.4 Piste */