diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index dfc8078a65..dbe718a561 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -14,14 +14,14 @@
   5.1 Secondary 10-22 ZOOM
   5.2 Secondary tunnel 16-22 ZOOM
   5.3 Secondary bridge 14-22 ZOOM
-6.RESIDENTAL & TERTIARY 11-22 ZOOM
-  6.1 Residential & Tertiary 11-22 ZOOM
-  6.2 Residential & Tertiary tunnel 16-22 ZOOM
-  6.3 Residential & Tertiary bridge 14-22 ZOOM
-7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM
-  7.1 Road, Street, Unclassified 12-22 ZOOM
-  7.2 Road, Street, Unclassified tunnel 16-22 ZOOM
-  7.3 Road, Street, Unclassified bridge 14-22 ZOOM
+6.TERTIARY & UNCLASSIFIED 11-22 ZOOM
+  6.1 Tertiary & Unclassified 11-22 ZOOM
+  6.2 Tertiary & Unclassified tunnel 16-22 ZOOM
+  6.3 Tertiary & Unclassified bridge 14-22 ZOOM
+7.RESIDENTAL, ROAD, STREETS & SERVICE 12-22 ZOOM
+  7.1 Residential, Road, Street 12-22 ZOOM
+  7.2 Residential, Road, Street tunnel 16-22 ZOOM
+  7.3 Residential, Road, Street bridge 14-22 ZOOM
   7.4 Service 15-22 ZOOM
 8.OTHERS ROADS 13-22 ZOOM
   8.1 Pedestrian & ford 13-22 ZOOM
@@ -73,15 +73,27 @@ line|z9[highway=world_level]
 
 /* 3.TRUNK & MOTORWAY 7-22 ZOOM */
 
-line|z7-[highway=trunk],
-line|z7-[highway=motorway],
+line|z7-9[highway=trunk],
+line|z7-9[highway=motorway],
 {color: @trunk_orange_medium; opacity: 0.7;}
 
 line|z10-[highway=trunk],
 line|z10-[highway=motorway],
+{color: @trunk_orange_light; opacity: 0.7;}
 line|z10-[highway=motorway_link],
 line|z10-[highway=trunk_link],
-{color: @trunk_orange_light; opacity: 0.7;}
+{color: @primary_orange; 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],
+{opacity: 0.85;}
+line|z15-[highway=trunk],
+line|z15-[highway=motorway],
+line|z16-[highway=motorway_link],
+line|z16-[highway=trunk_link],
+{opacity: 1;}
+
 line|z12-[highway=motorway][tunnel?],
 line|z12-[highway=trunk][tunnel?],
 line|z12-[highway=motorway_link][tunnel?],
@@ -109,67 +121,67 @@ line|z8[highway=motorway]
 line|z9[highway=trunk],
 line|z9[highway=motorway]
 {width: 1.2;}
-
 line|z10[highway=trunk],
 line|z10[highway=motorway]
 {width: 1.5;}
-line|z10[highway=motorway_link],
-line|z10[highway=trunk_link]
-{width: 0.8;}
 line|z11[highway=trunk],
 line|z11[highway=motorway]
 {width: 1.7;}
-line|z11[highway=motorway_link],
-line|z11[highway=trunk_link]
-{width: 1.0;}
 line|z12[highway=trunk],
 line|z12[highway=motorway]
 {width: 1.9;}
-line|z12[highway=motorway_link],
-line|z12[highway=trunk_link]
-{width: 1.2;}
 line|z13[highway=trunk],
 line|z13[highway=motorway],
 {width: 2.8;}
-line|z13[highway=motorway_link],
-line|z13[highway=trunk_link]
-{width: 1.8;}
 line|z14[highway=trunk],
 line|z14[highway=motorway],
 {width: 3.8;}
-line|z14[highway=motorway_link],
-line|z14[highway=trunk_link]
-{width: 2.0;}
-line|z15-[highway=trunk],
-line|z15-[highway=motorway],
-{width: 4.4; opacity: 1;}
-line|z15[highway=motorway_link],
-line|z15[highway=trunk_link]
-{width: 2.4;}
+line|z15[highway=trunk],
+line|z15[highway=motorway],
+{width: 4.4;}
 line|z16[highway=trunk],
 line|z16[highway=motorway],
-{width: 5.5;}
-line|z16[highway=motorway_link],
-line|z16[highway=trunk_link]
-{width: 3;}
+{width: 6;}
 line|z17[highway=trunk],
 line|z17[highway=motorway],
 {width: 8.2;}
-line|z17[highway=motorway_link],
-line|z17[highway=trunk_link]
-{width: 4.5;}
 line|z18[highway=trunk],
 line|z18[highway=motorway],
 {width: 11;}
-line|z18-[highway=motorway_link],
-line|z18-[highway=trunk_link]
-{width: 5.6; opacity: 1;}
 line|z19-[highway=trunk],
 line|z19-[highway=motorway],
 {width: 13.5;}
+
+line|z10[highway=motorway_link],
+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: 6.8;}
+{width: 11.6;}
 
 /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */
 
@@ -228,12 +240,17 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack
 
 line|z8-10[highway=primary],
 {color: @primary_orange; opacity: 0.7;}
-line|z11-14[highway=primary],
-line|z11-14[highway=primary_link]
+
+line|z11-12[highway=primary],
+line|z11-12[highway=primary_link]
 {color: @primary_orange_medium; opacity: 0.7;}
+line|z13-14[highway=primary],
+line|z13-14[highway=primary_link],
+{color: @primary_orange_medium; opacity: 0.85;}
 line|z15-[highway=primary],
-line|z15-[highway=primary_link]
-{color: @primary_orange_light; opacity: 0.7;}
+line|z15-[highway=primary_link],
+{color: @primary_orange_light; opacity: 1;}
+
 line|z14-[highway=primary][tunnel?],
 line|z14-[highway=primary_link][tunnel?]
 {casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing;casing-opacity: 0.7;}
@@ -246,40 +263,50 @@ line|z14-[highway=primary_link][bridge?]::bridgeblack,
 
 /* 4.1 Primary 8-22 ZOOM */
 
-line|z8[highway=primary]
-{width: 0.9;}
-line|z9[highway=primary]
+line|z8[highway=primary],
+{width: 0.7;}
+line|z9[highway=primary],
 {width: 0.8;}
-line|z10[highway=primary]
+line|z10[highway=primary],
 {width: 1.2;}
 line|z11[highway=primary],
-line|z11[highway=primary_link]
 {width: 1.5;}
 line|z12[highway=primary],
-line|z12[highway=primary_link]
 {width: 1.7;}
 line|z13[highway=primary],
-line|z13[highway=primary_link]
-{width: 2.4;}
+{width: 2.3;}
 line|z14[highway=primary],
-line|z14[highway=primary_link]
 {width: 3.2;}
-line|z15-[highway=primary],
-line|z15-[highway=primary_link]
-{width: 3.8; opacity: 1;}
+line|z15[highway=primary],
+{width: 3.8;}
 line|z16[highway=primary],
-line|z16[highway=primary_link]
-{width: 4.4;}
+{width: 5;}
 line|z17[highway=primary],
-line|z17[highway=primary_link]
 {width: 6.6;}
 line|z18[highway=primary],
-line|z18[highway=primary_link]
 {width: 9.4;}
 line|z19-[highway=primary],
-line|z19-[highway=primary_link]
 {width: 11.6;}
 
+line|z11[highway=primary_link],
+{width: 0.8;}
+line|z12[highway=primary_link],
+{width: 1.0;}
+line|z13[highway=primary_link],
+{width: 1.3;}
+line|z14[highway=primary_link],
+{width: 1.8;}
+line|z15[highway=primary_link],
+{width: 2.5;}
+line|z16[highway=primary_link],
+{width: 3.2;}
+line|z17[highway=primary_link],
+{width: 4.7;}
+line|z18[highway=primary_link],
+{width: 6.4;}
+line|z19-[highway=primary_link],
+{width: 8.2;}
+
 /* 4.2 Primary tunnel 14-22 ZOOM */
 
 line|z14[highway=primary][tunnel?],
@@ -313,12 +340,15 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack,
 
 /* 5.SECONDARY 10-22 ZOOM */
 
-line|z10-[highway=secondary],
-line|z13-[highway=secondary_link],
+line|z10-12[highway=secondary],
 {color: @secondary; opacity: 0.8;}
+line|z13-14[highway=secondary],
+line|z13-14[highway=secondary_link],
+{color: @secondary_light; opacity: 0.9;}
 line|z15-[highway=secondary],
 line|z15-[highway=secondary_link],
-{color: @secondary_light; opacity: 0.8;}
+{color: @secondary_light; opacity: 1;}
+
 line|z16-[highway=secondary][tunnel?],
 line|z16-[highway=secondary_link][tunnel?]
 {casing-width: 1;casing-linecap: butt;casing-color: @secondary_tunnel_casing;casing-opacity: 0.7;}
@@ -331,34 +361,42 @@ line|z14-[highway=secondary_link][bridge?]::bridgeblack,
 
 /* 5.1 Secondary 10-22 ZOOM */
 
-line|z10[highway=secondary]
-{width: 1;}
-line|z11[highway=secondary]
-{width: 1.3;}
-line|z12[highway=secondary]
-{width: 1.6;}
+line|z10[highway=secondary],
+{width: 1.2;}
+line|z11[highway=secondary],
+{width: 1.5;}
+line|z12[highway=secondary],
+{width: 1.7;}
 line|z13[highway=secondary],
-line|z13[highway=secondary_link],
-{width: 2.2;}
+{width: 2.3;}
 line|z14[highway=secondary],
-line|z14[highway=secondary_link]
-{width: 3;}
+{width: 3.2;}
 line|z15[highway=secondary],
-line|z15[highway=secondary_link]
-{width: 3.9;}
-line|z16-[highway=secondary],
-line|z16-[highway=secondary_link]
-{width: 4.4; opacity: 1;}
+{width: 3.8;}
+line|z16[highway=secondary],
+{width: 5;}
 line|z17[highway=secondary],
-line|z17[highway=secondary_link]
 {width: 6.6;}
 line|z18[highway=secondary],
-line|z18[highway=secondary_link]
 {width: 9.4;}
 line|z19-[highway=secondary],
-line|z19-[highway=secondary_link]
 {width: 11.6;}
 
+line|z13[highway=secondary_link],
+{width: 1.3;}
+line|z14[highway=secondary_link],
+{width: 1.8;}
+line|z15[highway=secondary_link],
+{width: 2.5;}
+line|z16[highway=secondary_link],
+{width: 3.2;}
+line|z17[highway=secondary_link],
+{width: 4.7;}
+line|z18[highway=secondary_link],
+{width: 6.4;}
+line|z19-[highway=secondary_link],
+{width: 8.2;}
+
 /* 5.2 Secondary tunnel 16-22 ZOOM */
 
 line|z16-17[highway=secondary][tunnel?],
@@ -390,175 +428,203 @@ line|z18-[highway=secondary][bridge?]::bridgeblack,
 line|z18-[highway=secondary_link][bridge?]::bridgeblack
 {casing-width-add: 2;}
 
-/* 6.RESIDENTAL & TERTIARY 11-22 ZOOM */
+/* 6.TERTIARY & UNCLASSIFIED 11-22 ZOOM */
 
-line|z12-[highway=residential],
 line|z11-[highway=tertiary],
+line|z11-[highway=unclassified],
 line|z14-[highway=tertiary_link],
-{color: @residential; opacity: 0.85;}
+{color: @tertiary; opacity: 0.7;}
+line|z14-15[highway=tertiary],
+line|z14-15[highway=unclassified],
+line|z15-16[highway=tertiary_link],
+{opacity: 0.85;}
+line|z16-[highway=tertiary],
+line|z16-[highway=unclassified],
+line|z17-[highway=tertiary_link],
+{opacity: 1;}
+
 line|z16-[highway=tertiary][tunnel?],
-line|z16-[highway=residential][tunnel?],
 line|z16-[highway=tertiary_link][tunnel?],
+line|z16-[highway=unclassified][tunnel?],
 {color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;casing-opacity: 0.7;}
 line|z14-[highway=tertiary][bridge?]::bridgewhite,
-line|z14-[highway=residential][bridge?]::bridgewhite,
 line|z14-[highway=tertiary_link][bridge?]::bridgewhite
+line|z14-[highway=unclassified][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
 line|z14-[highway=tertiary][bridge?]::bridgeblack,
-line|z14-[highway=residential][bridge?]::bridgeblack,
 line|z14-[highway=tertiary_link][bridge?]::bridgeblack
+line|z14-[highway=unclassified][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
 
-/* 6.1 Residential & Tertiary 11-22 ZOOM */
+/* 6.1 Tertiary & Unclassified 11-22 ZOOM */
 
-line|z11[highway=tertiary]
+line|z11[highway=tertiary],
+line|z11[highway=unclassified],
 {width: 0.8;}
-line|z12-13[highway=residential],
-line|z12-13[highway=tertiary]
-{width: 1.2;}
-line|z14[highway=residential],
+line|z12[highway=tertiary],
+line|z12[highway=unclassified],
+{width: 1.3;}
+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],
 {width: 1.8;}
-line|z15[highway=residential],
-line|z15[highway=tertiary],
-line|z15[highway=tertiary_link]
-{width: 3;}
-line|z16[highway=residential],
-line|z16[highway=tertiary],
-line|z16[highway=tertiary_link]
-{width: 4.2;}
-line|z17-[highway=residential],
-line|z17-[highway=tertiary],
-line|z17-[highway=tertiary_link]
-{width: 5.5; opacity: 1;}
-line|z18[highway=residential],
-line|z18[highway=tertiary],
-line|z18[highway=tertiary_link]
+line|z15[highway=tertiary_link],
+{width: 2.5;}
+line|z16[highway=tertiary_link],
+{width: 3.2;}
+line|z17[highway=tertiary_link],
+{width: 4.7;}
+line|z18[highway=tertiary_link],
+{width: 6.4;}
+line|z19-[highway=tertiary_link],
 {width: 8.2;}
-line|z19-[highway=residential],
-line|z19-[highway=tertiary],
-line|z19-[highway=tertiary_link]
-{width: 10.4;}
 
-/* 6.2 Residential & Tertiary tunnel 16-22 ZOOM */
+/* 6.2 Tertiary & Unclassified tunnel 16-22 ZOOM */
 
 line|z16[highway=tertiary][tunnel?],
-line|z16[highway=residential][tunnel?],
 line|z16[highway=tertiary_link][tunnel?],
-{casing-dashes: 5,5; opacity: 0.85;}
+line|z16[highway=unclassified][tunnel?],
+{casing-dashes: 5,5; opacity: 0.8;}
 line|z17-[highway=tertiary][tunnel?],
-line|z17-[highway=residential][tunnel?],
 line|z17-[highway=tertiary_link][tunnel?],
+line|z17-[highway=unclassified][tunnel?],
 {casing-dashes: 5,5; opacity: 1;}
 
-/* 6.3 Residential & Tertiary bridge 14-22 ZOOM */
+/* 6.3 Tertiary & Unclassified bridge 14-22 ZOOM */
 
 line|z14-16[highway=tertiary][bridge?]::bridgewhite,
 line|z14-16[highway=tertiary_link][bridge?]::bridgewhite,
-line|z14-16[highway=residential][bridge?]::bridgewhite,
+line|z14-16[highway=unclassified][bridge?]::bridgewhite,
 {casing-width-add: 0;}
 line|z17[highway=tertiary][bridge?]::bridgewhite,
 line|z17[highway=tertiary_link][bridge?]::bridgewhite,
-line|z17[highway=residential][bridge?]::bridgewhite,
+line|z17[highway=unclassified][bridge?]::bridgewhite,
 {casing-width-add: 0.8;}
 line|z18-[highway=tertiary][bridge?]::bridgewhite,
 line|z18-[highway=tertiary_link][bridge?]::bridgewhite,
-line|z18-[highway=residential][bridge?]::bridgewhite,
+line|z18-[highway=unclassified][bridge?]::bridgewhite,
 {casing-width-add: 1;}
 
 line|z14-16[highway=tertiary][bridge?]::bridgeblack,
 line|z14-16[highway=tertiary_link][bridge?]::bridgeblack,
-line|z14-16[highway=residential][bridge?]::bridgeblack,
+line|z14-16[highway=unclassified][bridge?]::bridgeblack,
 {casing-width-add: 0.4;}
 line|z17[highway=tertiary][bridge?]::bridgeblack,
 line|z17[highway=tertiary_link][bridge?]::bridgeblack,
-line|z17[highway=residential][bridge?]::bridgeblack,
+line|z17[highway=unclassified][bridge?]::bridgeblack,
 {casing-width-add: 1.6;}
 line|z18-[highway=tertiary][bridge?]::bridgeblack,
 line|z18-[highway=tertiary_link][bridge?]::bridgeblack,
-line|z18-[highway=residential][bridge?]::bridgeblack,
-{casing-width-add: 2;}
-
-/* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM */
-
-line|z11-[highway=unclassified],
-line|z12-[highway=road],
-line|z12-[highway=living_street],
-line|z12-[aeroway=runway],
-line|z14-[aeroway=taxiway],
-line|z15-[highway=service],
-line|z15-[highway=service][service=busway],
-line|z15-[highway=busway],
-{color: @unclassified; opacity: 0.85;}
-line|z16-[highway=unclassified][tunnel?],
-line|z16-[highway=living_street][tunnel?],
-{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;casing-opacity: 0.7;}
-line|z14-[highway=unclassified][bridge?]::bridgewhite,
-{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.85;}
-line|z14-[highway=unclassified][bridge?]::bridgeblack,
-{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
-
-/* 7.1 Road, Street, Unclassified 12-22 ZOOM */
-line|z11[highway=unclassified]
-{width: 0.8;}
-line|z12[highway=unclassified],
-line|z12[highway=road],
-line|z12[highway=living_street]
-{color: @residential;width: 1.2;}
-line|z13[highway=unclassified],
-line|z13[highway=road],
-line|z13[highway=living_street]
-{width: 1.2;}
-line|z14[highway=unclassified],
-line|z14[highway=road],
-line|z14[highway=living_street]
-{width: 1.8;}
-line|z15[highway=unclassified],
-line|z15[highway=road],
-line|z15[highway=living_street]
-{width: 3;}
-line|z16[highway=unclassified],
-line|z16[highway=road],
-line|z16[highway=living_street]
-{width: 4;}
-line|z17-[highway=unclassified],
-line|z17-[highway=road],
-line|z17-[highway=living_street]
-{width: 5.4; opacity: 1;}
-line|z18-[highway=unclassified],
-line|z18-[highway=road],
-line|z18-[highway=living_street]
-{width: 8;}
-line|z19-[highway=unclassified],
-line|z19-[highway=road],
-line|z19-[highway=living_street]
-{width: 10;}
-
-/* 7.2 Road, Street, Unclassified tunnel 16-22 ZOOM */
-
-line|z16-[highway=unclassified][tunnel?],
-line|z16-[highway=living_street][tunnel?],
-{casing-dashes: 5,5;}
-
-/* 7.3 Road, Street, Unclassified bridge 14-22 ZOOM */
-
-line|z14-16[highway=unclassified][bridge?]::bridgewhite,
-{casing-width-add: 0;}
-line|z17[highway=unclassified][bridge?]::bridgewhite,
-{casing-width-add: 0.8;}
-line|z18-[highway=unclassified][bridge?]::bridgewhite,
-{casing-width-add: 1;}
-
-line|z14-16[highway=unclassified][bridge?]::bridgeblack,
-{casing-width-add: 0.4;}
-line|z17[highway=unclassified][bridge?]::bridgeblack,
-{casing-width-add: 1.6;}
 line|z18-[highway=unclassified][bridge?]::bridgeblack,
 {casing-width-add: 2;}
 
+/* 7.RESIDENTIAL, ROAD, STREETS & SERVICE 12-22 ZOOM */
+
+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],
+{opacity: 0.85;}
+line|z17-[highway=residential],
+line|z17-[highway=road],
+line|z17-[highway=living_street],
+{opacity: 1;}
+
+line|z16-[highway=residential][tunnel?],
+line|z16-[highway=living_street][tunnel?],
+{color: @residential_tunnel; casing-width: 1; casing-linecap: butt; casing-color: @residential_tunnel_casing; casing-opacity: 0.7;}
+line|z14-[highway=residential][bridge?]::bridgewhite,
+{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
+line|z14-[highway=residential][bridge?]::bridgeblack,
+{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
+
+/* 7.1 Residential, Road, Street 12-22 ZOOM */
+
+line|z12[highway=residential],
+line|z12[highway=road],
+line|z12[highway=living_street]
+{width: 0.7;}
+line|z13[highway=residential],
+line|z13[highway=road],
+line|z13[highway=living_street]
+{width: 1;}
+line|z14[highway=residential],
+line|z14[highway=road],
+line|z14[highway=living_street]
+{width: 1.6;}
+line|z15[highway=residential],
+line|z15[highway=road],
+line|z15[highway=living_street]
+{width: 2.4;}
+line|z16[highway=residential],
+line|z16[highway=road],
+line|z16[highway=living_street]
+{width: 3.2;}
+line|z17[highway=residential],
+line|z17[highway=road],
+line|z17[highway=living_street]
+{width: 4.7;}
+line|z18[highway=residential],
+line|z18[highway=road],
+line|z18[highway=living_street]
+{width: 6.4;}
+line|z19-[highway=residential],
+line|z19-[highway=road],
+line|z19-[highway=living_street]
+{width: 8.2;}
+
+/* 7.2 Residential, Road, Street tunnel 16-22 ZOOM */
+
+line|z16-[highway=residential][tunnel?],
+line|z16-[highway=living_street][tunnel?],
+{casing-dashes: 5,5;}
+
+/* 7.3 Residential, Road, Street bridge 14-22 ZOOM */
+
+line|z14-16[highway=residential][bridge?]::bridgewhite,
+{casing-width-add: 0;}
+line|z17[highway=residential][bridge?]::bridgewhite,
+{casing-width-add: 0.8;}
+line|z18-[highway=residential][bridge?]::bridgewhite,
+{casing-width-add: 1;}
+
+line|z14-16[highway=residential][bridge?]::bridgeblack,
+{casing-width-add: 0.4;}
+line|z17[highway=residential][bridge?]::bridgeblack,
+{casing-width-add: 1.6;}
+line|z18-[highway=residential][bridge?]::bridgeblack,
+{casing-width-add: 2;}
+
 /* 7.4 Service 15-22 ZOOM */
 
+line|z15-[highway=service],
+line|z15-[highway=service][service=busway],
+line|z15-[highway=busway],
+{color: @residential; opacity: 0.8;}
+
 line|z15[highway=service],
 line|z15[highway=service][service=busway],
 line|z15[highway=busway],
@@ -630,7 +696,7 @@ line|z14-[highway=footway][sac_scale],
 line|z14-[piste:type=hike],
 {color: @piste; opacity: 0.4;}
 line|z16-[highway=pedestrian][tunnel?]
-{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing; casing-opacity: 0.7;}
+{color: @residential_tunnel; casing-width: 1; casing-linecap: butt; casing-color: @residential_tunnel_casing; casing-opacity: 0.7;}
 line|z17-[highway=footway][tunnel?]::tunnelBackground,
 line|z17-[highway=cycleway][tunnel?]::tunnelBackground,
 line|z17-[highway=path][tunnel?]::tunnelBackground,
@@ -930,6 +996,10 @@ line|z17-[highway=bridleway][bridge?]::bridgeblack
 
 /* 8.11 Runway 12-22 ZOOM */
 
+line|z12-[aeroway=runway],
+line|z14-[aeroway=taxiway],
+{color: @residential; opacity: 0.8;}
+
 line|z12[aeroway=runway]
 {width: 1; opacity: 0.4;}
 line|z13[aeroway=runway]
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index d245ec0f7c..7e8be1aa26 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -106,8 +106,8 @@
 @primary_orange_light: #FFA14C;
 @secondary: #FFB226;
 @secondary_light: #FFBF52;
+@tertiary: #FFFFFF;
 @residential: #F8F8F8;
-@unclassified: #F8F8F8;
 @pedestrian: #F8F8F8;
 @footway: #F8F8F8;
 @cycleway: #FF87AD;
@@ -131,8 +131,8 @@
 @secondary_tunnel_casing:  #808080;
 @tertiary_tunnel: #FFFFFF;
 @tertiary_tunnel_casing:  #808080;
-@unclassified_tunnel: #FFFFFF;
-@unclassified_tunnel_casing: #808080;
+@residential_tunnel: #FFFFFF;
+@residential_tunnel_casing: #808080;
 
 /* 5.4 Piste */
 
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 164d0aaea4..e42825ad02 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -106,8 +106,8 @@
 @primary_orange_light: #593323;
 @secondary: #573E33;
 @secondary_light: #573E33;
+@tertiary: #4F4A47;
 @residential: #4B4643;
-@unclassified: #4B4643;
 @pedestrian: #4D4744;
 @footway: #4B4643;
 @cycleway: #6E3D47;
@@ -131,8 +131,8 @@
 @secondary_tunnel_casing:  #000000;
 @tertiary_tunnel: #2B2827;
 @tertiary_tunnel_casing:  #000000;
-@unclassified_tunnel: #2B2827;
-@unclassified_tunnel_casing: #000000;
+@residential_tunnel: #2B2827;
+@residential_tunnel_casing: #000000;
 
 /* 5.4 Piste */
 
diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss
index dabb507057..faaa8dd836 100644
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -28,7 +28,7 @@ line|z11-12[highway=construction],
 
 /* Make service roads more pronounced - they lead to trailheads quite often. */
 line|z13-[highway=service],
-{color: @unclassified; opacity: 1;}
+{color: @residential; opacity: 1;}
 line|z13[highway=service],
 {width: 0.8;}
 line|z14[highway=service],