diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss
index 13489971b..00a4c00da 100644
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -114,56 +114,56 @@ line|z14-[highway=trunk_link][bridge?]::bridgeblack,
 /* 3.1 Trunk & Motorway 6-22 ZOOM */
 
 line|z6[highway=motorway],
-{width: 1.5;}
-line|z7[highway=motorway]
-{width: 1.6;}
-line|z8[highway=motorway]
 {width: 1.7;}
-line|z9[highway=motorway]
+line|z7[highway=motorway]
 {width: 1.8;}
-line|z10[highway=motorway]
+line|z8[highway=motorway]
 {width: 1.9;}
-line|z11[highway=motorway]
+line|z9[highway=motorway]
 {width: 2.0;}
+line|z10[highway=motorway]
+{width: 2.2;}
+line|z11[highway=motorway]
+{width: 2.4;}
 line|z12[highway=motorway]
-{width: 2.1;}
+{width: 2.7;}
 line|z13[highway=motorway],
-{width: 3.0;}
+{width: 3.6;}
 line|z14[highway=motorway],
-{width: 3.9;}
+{width: 4.4;}
 line|z15[highway=motorway],
-{width: 4.5;}
+{width: 5.6;}
 line|z16[highway=motorway],
-{width: 6.1;}
+{width: 7.8;}
 line|z17[highway=motorway],
-{width: 8.3;}
+{width: 9.0;}
 line|z18[highway=motorway],
-{width: 11.1;}
+{width: 12.0;}
 line|z19-[highway=motorway],
-{width: 13.6;}
+{width: 16.0;}
 
 line|z6[highway=trunk],
 {width: 0.8;}
 line|z7[highway=trunk],
 {width: 0.9;}
 line|z8[highway=trunk],
-{width: 1.1;}
-line|z9[highway=trunk],
 {width: 1.2;}
+line|z9[highway=trunk],
+{width: 1.3;}
 line|z10[highway=trunk],
-{width: 1.5;}
-line|z11[highway=trunk],
-{width: 1.7;}
-line|z12[highway=trunk],
 {width: 1.9;}
+line|z11[highway=trunk],
+{width: 2.1;}
+line|z12[highway=trunk],
+{width: 2.4;}
 line|z13[highway=trunk],
-{width: 2.8;}
+{width: 3.2;}
 line|z14[highway=trunk],
-{width: 3.8;}
+{width: 4.0;}
 line|z15[highway=trunk],
-{width: 4.4;}
+{width: 4.8;}
 line|z16[highway=trunk],
-{width: 6;}
+{width: 6.2;}
 line|z17[highway=trunk],
 {width: 8.2;}
 line|z18[highway=trunk],
@@ -294,29 +294,30 @@ line|z14-[highway=primary_link][bridge?]::bridgeblack,
 /* 4.1 Primary 8-22 ZOOM */
 
 line|z8[highway=primary],
-{width: 0.8;}
+{width: 0.7;}
 line|z9[highway=primary],
-{width: 0.9;}
+{width: 0.8;}
 line|z10[highway=primary],
-{width: 1.2;}
+{width: 1.6;}
 line|z11[highway=primary],
-{width: 1.5;}
+{width: 2.0;}
 line|z12[highway=primary],
-{width: 1.7;}
+{width: 2.2;}
 line|z13[highway=primary],
-{width: 2.3;}
+{width: 2.6;}
 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;}
@@ -390,13 +391,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: 1.8;}
 line|z12[highway=secondary],
-{width: 1.7;}
+{width: 2.0;}
 line|z13[highway=secondary],
-{width: 2.3;}
+{width: 2.4;}
 line|z14[highway=secondary],
 {width: 3.2;}
 line|z15[highway=secondary],
@@ -455,18 +456,28 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack
 
 /* 6.TERTIARY & UNCLASSIFIED 11-22 ZOOM */
 
-line|z11-[highway=tertiary],
-line|z11-[highway=unclassified],
+line|z11-[highway=tertiary]
+{color: @tertiary; opacity: 1;}
+line|z12-13[highway=tertiary],
+{opacity: 0.95;}
 line|z14-[highway=tertiary_link],
-{color: @tertiary; opacity: 0.7;}
+{color: @tertiary;}
+line|z11-[highway=unclassified]
+{color: @tertiary; opacity: 0.95;}
+line|z12[highway=unclassified]
+{opacity: 0.8;}
+line|z13[highway=unclassified]
+{opacity: 0.58;}
 line|z14-15[highway=tertiary],
-line|z14-15[highway=unclassified],
 line|z15-16[highway=tertiary_link],
-{opacity: 0.85;}
+{color: @tertiary; opacity: 0.9;}
+line|z13-15[highway=unclassified]
+{opacity: 0.8;}
 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
@@ -480,31 +491,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],
@@ -520,6 +522,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?],
@@ -560,11 +581,11 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack,
 line|z12-[highway=residential],
 line|z12-[highway=road],
 line|z12-[highway=living_street],
-{color: @residential; opacity: 1;}
-line|z14-16[highway=residential],
-line|z14-16[highway=road],
-line|z14-16[highway=living_street],
-{opacity: 0.9;}
+{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],
 line|z17-[highway=living_street],
@@ -821,35 +842,29 @@ line|z17[highway=footway][bicycle=designated]::cycleline,
 {opacity: 0.9;}
 
 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=path][bicycle=designated]::cycleline,
 {width: 1.2;}
-line|z16[highway=cycleway],
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 1.3;}
-line|z17[highway=cycleway],
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 1.4;}
-line|z18[highway=cycleway],
-line|z18[highway=path][bicycle=designated]::cycleline,
-{width: 1.6;}
-line|z19-[highway=cycleway],
-line|z19-[highway=path][bicycle=designated]::cycleline,
-{width: 1.8;}
-
+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: 2;}
+line|z17[highway=cycleway],
 line|z17[highway=footway][bicycle=designated]::cycleline,
+line|z17[highway=path][bicycle=designated]::cycleline,
 {width: 2.4;}
+line|z18[highway=cycleway],
 line|z18[highway=footway][bicycle=designated]::cycleline,
+line|z18[highway=path][bicycle=designated]::cycleline,
 {width: 3.2;}
+line|z19-[highway=cycleway],
 line|z19-[highway=footway][bicycle=designated]::cycleline,
+line|z19-[highway=path][bicycle=designated]::cycleline,
 {width: 4.2;}
 
 line|z17[highway=cycleway][tunnel?]::tunnelBackground