diff -uNar orig/osm-map-features-z12.xml mod/osm-map-features-z12.xml
--- orig/osm-map-features-z12.xml	2008-01-23 10:38:08.000000000 +0100
+++ mod/osm-map-features-z12.xml	2008-01-24 19:24:04.000000000 +0100
@@ -131,30 +131,46 @@
         <rule e="way" k="waterway" v="riverbank">
             <area class='waterway-riverbank'/>
         </rule>
-        <rule e="way" k="waterway" v="river">
-            <line class='waterway-casing waterway-river-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="stream">
-            <line class='waterway-casing waterway-stream-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="canal">
-            <line class='waterway-casing waterway-canal-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="drain">
-            <line class='waterway-casing waterway-drain-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="river">
-            <line class='waterway-core waterway-river-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="stream">
-            <line class='waterway-core waterway-stream-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="canal">
-            <line class='waterway-core waterway-canal-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="drain">
-            <line class='waterway-core waterway-drain-core'/>
-        </rule>
+	<rule e="way" k="tunnel" v="true|yes">
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-tunnelcore'/>
+		</rule>
+	</rule>
+	<else>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-casing waterway-river-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-casing waterway-stream-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-casing waterway-canal-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-casing waterway-drain-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-core'/>
+		</rule>
+	</else>
         <rule e="way" k="waterway" v="dock">
             <area class='natural-water' />
         </rule>
@@ -229,6 +245,9 @@
             <rule e="way" k="highway" v="unclassified|residential|minor">
                 <line class='highway-casing highway-unclassified-casing' />
             </rule>
+	    <rule e="way" k="highway" v="living_street">
+		    <line class='highway-casing highway-living_street-casing' />
+            </rule>
             <rule e="way" k="highway" v="tertiary">
                 <line class='highway-casing highway-tertiary-casing' />
             </rule>
@@ -342,7 +361,7 @@
             <rule e="way" k="highway" v="service">
                 <line class='highway-core highway-service-core' />
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <line class='highway-core highway-unclassified-core' />
             </rule>
             <rule e="way" k="highway" v="tertiary">
@@ -437,7 +456,7 @@
 				<line class='tunnel-casing highway-service-casing tunnel' mask-class='tunnel-core highway-service-core'/>
 				<line class='highway-service-casing highway-tunnel-ends'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor|tertiary">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street|tertiary">
 				<line class='tunnel-casing highway-unclassified-casing tunnel' mask-class='tunnel-core highway-unclassified-core'/>
 				<line class='highway-unclassified-casing highway-tunnel-ends'/>
             </rule>
@@ -711,6 +730,8 @@
               
             .highway-unclassified-casing            { stroke-width: 5px; stroke: #c0c0c0; }
             .highway-unclassified-core              { stroke-width: 1.2px; stroke: #ffffff; }
+	    
+	    .highway-living_street-casing           { stroke-width: 5px; stroke: #c0c0c0; stroke-dasharray: 1.5, 1.5; stroke-linecap: round;}
 
             .highway-service-casing                 { stroke-width: 4px; stroke: #222222; }
             .highway-service-core                   { stroke-width: 3.5px; stroke: #ffffff; }
@@ -848,6 +869,8 @@
                 fill: none;
             }
 
+	    .waterway-river-tunnelcore              { stroke-width: 8px; stroke-dasharray: 4 4; stroke-linecap: butt;}
+
             .waterway-stream-casing {
                 stroke-width: 4px;
                 stroke-linecap: butt;
@@ -864,6 +887,8 @@
                 fill: none;
             }
 
+	    .waterway-stream-tunnelcore             { stroke-width: 3px; stroke-dasharray: 2 2; stroke-linecap: butt;}
+
             .waterway-canal-casing {
                 stroke-width: 2px;
                 stroke-linecap: butt;
@@ -880,6 +905,8 @@
                 fill: none;
             }
 
+	    .waterway-canal-tunnelcore              { stroke-width: 1px; stroke-dasharray: 1 1; stroke-linecap: butt;}
+
             .waterway-drain-casing {
                 stroke-width: 1px;
                 stroke-linecap: butt;
@@ -896,6 +923,8 @@
                 fill: none;
             }
 
+	    .waterway-drain-tunnelcore              { stroke-width: 0.5px; stroke-dasharray: 1 1; stroke-linecap: butt;}
+
 
             /* Ferry */
             .route-ferry {
diff -uNar orig/osm-map-features-z13.xml mod/osm-map-features-z13.xml
--- orig/osm-map-features-z13.xml	2008-01-23 10:38:08.000000000 +0100
+++ mod/osm-map-features-z13.xml	2008-01-24 19:24:04.000000000 +0100
@@ -138,30 +138,46 @@
         <rule e="way" k="waterway" v="riverbank">
             <area class='waterway-riverbank'/>
         </rule>
-        <rule e="way" k="waterway" v="river">
-            <line class='waterway-casing waterway-river-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="stream">
-            <line class='waterway-casing waterway-stream-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="canal">
-            <line class='waterway-casing waterway-canal-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="drain">
-            <line class='waterway-casing waterway-drain-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="river">
-            <line class='waterway-core waterway-river-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="stream">
-            <line class='waterway-core waterway-stream-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="canal">
-            <line class='waterway-core waterway-canal-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="drain">
-            <line class='waterway-core waterway-drain-core'/>
-        </rule>
+	<rule e="way" k="tunnel" v="true|yes">
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-tunnelcore'/>
+		</rule>
+	</rule>
+	<else>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-casing waterway-river-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-casing waterway-stream-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-casing waterway-canal-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-casing waterway-drain-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-core'/>
+		</rule>
+	</else>
         <rule e="way" k="waterway" v="dock">
             <area class='natural-water' />
         </rule>
@@ -236,6 +252,9 @@
             <rule e="way" k="highway" v="unclassified|residential|minor">
                 <line class='highway-casing highway-unclassified-casing' />
             </rule>
+	    <rule e="way" k="highway" v="living_street">
+		    <line class='highway-casing highway-living_street-casing' />
+            </rule>
             <rule e="way" k="highway" v="tertiary">
                 <line class='highway-casing highway-tertiary-casing' />
             </rule>
@@ -349,7 +368,7 @@
             <rule e="way" k="highway" v="service">
                 <line class='highway-core highway-service-core' />
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <line class='highway-core highway-unclassified-core' />
             </rule>
             <rule e="way" k="highway" v="tertiary">
@@ -444,7 +463,7 @@
 				<line class='tunnel-casing highway-service-casing tunnel' mask-class='tunnel-core highway-service-core'/>
 				<line class='highway-service-casing highway-tunnel-ends'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor|tertiary">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_streets|tertiary">
 				<line class='tunnel-casing highway-unclassified-casing tunnel' mask-class='tunnel-core highway-unclassified-core'/>
 				<line class='highway-unclassified-casing highway-tunnel-ends'/>
             </rule>
@@ -768,6 +787,8 @@
               
             .highway-unclassified-casing            { stroke-width: 6px; stroke: #222222; }
             .highway-unclassified-core              { stroke-width: 5.5px; stroke: #ffffff; }
+	    
+	    .highway-living_street-casing           { stroke-width: 6px; stroke: #222222; stroke-dasharray: 1.5, 1.5; stroke-linecap: round;}
 
             .highway-service-casing                 { stroke-width: 4px; stroke: #222222; }
             .highway-service-core                   { stroke-width: 3.5px; stroke: #ffffff; }
@@ -904,6 +925,8 @@
                 fill: none;
             }
 
+	    .waterway-river-tunnelcore              { stroke-width: 8px; stroke-dasharray: 4 4; stroke-linecap: butt;}
+
             .waterway-stream-casing {
                 stroke-width: 4px;
                 stroke-linecap: butt;
@@ -920,6 +943,8 @@
                 fill: none;
             }
 
+	    .waterway-stream-tunnelcore             { stroke-width: 3px; stroke-dasharray: 2 2; stroke-linecap: butt;}
+
             .waterway-canal-casing {
                 stroke-width: 2px;
                 stroke-linecap: butt;
@@ -936,6 +961,8 @@
                 fill: none;
             }
 
+	    .waterway-canal-tunnelcore              { stroke-width: 1px; stroke-dasharray: 1 1; stroke-linecap: butt;}
+
             .waterway-drain-casing {
                 stroke-width: 1px;
                 stroke-linecap: butt;
@@ -952,6 +979,8 @@
                 fill: none;
             }
 
+	    .waterway-drain-tunnelcore              { stroke-width: 0.5px; stroke-dasharray: 1 1; stroke-linecap: butt;}
+
             .railway-station {
                 fill: red;
                 stroke: #666666;
diff -uNar orig/osm-map-features-z14.xml mod/osm-map-features-z14.xml
--- orig/osm-map-features-z14.xml	2008-01-23 10:38:08.000000000 +0100
+++ mod/osm-map-features-z14.xml	2008-01-24 19:24:04.000000000 +0100
@@ -154,30 +154,46 @@
         <rule e="way" k="waterway" v="riverbank">
             <area class='waterway-riverbank'/>
         </rule>
-        <rule e="segment|way" k="waterway" v="river">
-            <line class='waterway-casing waterway-river-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="stream">
-            <line class='waterway-casing waterway-stream-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="canal">
-            <line class='waterway-casing waterway-canal-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="drain">
-            <line class='waterway-casing waterway-drain-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="river">
-            <line class='waterway-core waterway-river-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="stream">
-            <line class='waterway-core waterway-stream-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="canal">
-            <line class='waterway-core waterway-canal-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="drain">
-            <line class='waterway-core waterway-drain-core'/>
-        </rule>
+	<rule e="way" k="tunnel" v="true|yes">
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-tunnelcore'/>
+		</rule>
+	</rule>
+	<else>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-casing waterway-river-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-casing waterway-stream-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-casing waterway-canal-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-casing waterway-drain-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-core'/>
+		</rule>
+	</else>
         <rule e="way" k="waterway" v="dock">
             <area class='natural-water' />
         </rule>
@@ -252,6 +268,9 @@
             <rule e="way" k="highway" v="unclassified|residential|minor">
                 <line class='highway-casing highway-unclassified-casing' />
             </rule>
+	    <rule e="way" k="highway" v="living_street">
+		    <line class='highway-casing highway-living_street-casing' />
+            </rule>
             <rule e="way" k="highway" v="tertiary">
                 <line class='highway-casing highway-tertiary-casing' />
             </rule>
@@ -399,7 +418,7 @@
 					<line class='highway-core highway-service-core' />
 				</else>
 			</rule>
-			<rule e="way" k="highway" v="unclassified|residential|minor">
+			<rule e="way" k="highway" v="unclassified|residential|minor|living_street">
 				<rule e="way" k="area" v="yes|true">
  					<area class='highway-core highway-unclassified-area' />
 				</rule>
@@ -539,7 +558,7 @@
 				<line class='tunnel-casing highway-service-casing tunnel' mask-class='tunnel-core highway-service-core'/>
 				<line class='highway-service-casing highway-tunnel-ends'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor|tertiary">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street|tertiary">
 				<line class='tunnel-casing highway-unclassified-casing tunnel' mask-class='tunnel-core highway-unclassified-core'/>
 				<line class='highway-unclassified-casing highway-tunnel-ends'/>
             </rule>
@@ -785,7 +804,7 @@
 					    <text k="name" startOffset='50%' class="waterway-name-core waterway-river-name-core" dy='2px' />
 					</rule>
 					
-					<rule e="way" k="highway" v="unclassified|residential|minor" layer="5">
+					<rule e="way" k="highway" v="unclassified|residential|minor|living_street" layer="5">
 					    <text k="name" startOffset='50%' class="highway-name highway-unclassified-name" dy='1.6px' />
 					</rule>
 					<rule e="way" k="highway" v="tertiary" layer="5">
@@ -1105,6 +1124,8 @@
             .highway-unclassified-area              { stroke-width: 3.0px;   stroke: #ffffff; fill: #ffffff; }
             .highway-unclassified-name              { stroke-width: 0px;     font-size: 9px; }
             .highway-unclassified-ref               { stroke-width: 0px;     font-size: 8px; }
+	    
+	    .highway-living_street-casing            { stroke-width: 3.7px;  stroke: #777777; stroke-dasharray: 1, 1; stroke-linecap: round; }
 
             .highway-service-bridge-casing          { stroke-width: 4.5px; }
             .highway-service-bridge-core            { stroke-width: 3.5px; }
@@ -1286,21 +1307,25 @@
 
             .waterway-river-casing                  { stroke-width: 6px; }
             .waterway-river-core                    { stroke-width: 4px; }
+	    .waterway-river-tunnelcore              { stroke-width: 4px; stroke-dasharray: 2 2; stroke-linecap: butt;}
 			.waterway-river-name-casing             { font-size: 6px; stroke-width: 0.4px;}
 			.waterway-river-name-core               { font-size: 6px; }
 
             .waterway-stream-casing                 { stroke-width: 1px; }
             .waterway-stream-core                   { stroke-width: 0.8px; }
+	    .waterway-stream-tunnelcore             { stroke-width: 0.8px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-stream-name-casing            { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-stream-name-core              { font-size: 3px; }
 
             .waterway-canal-casing                  { stroke-width: 4px; }
             .waterway-canal-core                    { stroke-width: 2px; }
+	    .waterway-canal-tunnelcore              { stroke-width: 2px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-canal-name-casing             { font-size: 6px; stroke-width: 0.4px;}
 			.waterway-canal-name-core               { font-size: 6px; }
 
             .waterway-drain-casing                  { stroke-width: 2px; }
             .waterway-drain-core                    { stroke-width: 1px; }
+	    .waterway-drain-tunnelcore              { stroke-width: 1px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-drain-name-casing             { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-drain-name-core               { font-size: 3px; }
 
diff -uNar orig/osm-map-features-z15.xml mod/osm-map-features-z15.xml
--- orig/osm-map-features-z15.xml	2008-01-23 10:38:08.000000000 +0100
+++ mod/osm-map-features-z15.xml	2008-01-24 19:24:04.000000000 +0100
@@ -151,30 +151,46 @@
         <rule e="way" k="waterway" v="riverbank">
             <area class='waterway-riverbank'/>
         </rule>
-        <rule e="segment|way" k="waterway" v="river">
-            <line class='waterway-casing waterway-river-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="stream">
-            <line class='waterway-casing waterway-stream-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="canal">
-            <line class='waterway-casing waterway-canal-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="drain">
-            <line class='waterway-casing waterway-drain-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="river">
-            <line class='waterway-core waterway-river-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="stream">
-            <line class='waterway-core waterway-stream-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="canal">
-            <line class='waterway-core waterway-canal-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="drain">
-            <line class='waterway-core waterway-drain-core'/>
-        </rule>
+	<rule e="way" k="tunnel" v="true|yes">
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-tunnelcore'/>
+		</rule>
+	</rule>
+	<else>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-casing waterway-river-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-casing waterway-stream-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-casing waterway-canal-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-casing waterway-drain-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-core'/>
+		</rule>
+	</else>
         <rule e="way" k="waterway" v="dock">
             <area class='natural-water' />
         </rule>
@@ -250,6 +266,9 @@
             <rule e="way" k="highway" v="unclassified|residential|minor">
                 <line class='highway-casing highway-unclassified-casing' />
             </rule>
+	    <rule e="way" k="highway" v="living_street">
+		    <line class='highway-casing highway-living_street-casing' />
+            </rule>
             <rule e="way" k="highway" v="tertiary">
                 <line class='highway-casing highway-tertiary-casing' />
             </rule>
@@ -399,7 +418,7 @@
 					<line class='highway-core highway-service-core' />
 				</else>
 			</rule>
-			<rule e="way" k="highway" v="unclassified|residential|minor">
+			<rule e="way" k="highway" v="unclassified|residential|minor|living_street">
 				<rule e="way" k="area" v="yes|true">
  					<area class='highway-core highway-unclassified-area' />
 				</rule>
@@ -539,7 +558,7 @@
 				<line class='tunnel-casing highway-service-casing tunnel' mask-class='tunnel-core highway-service-core'/>
 				<line class='highway-service-casing highway-tunnel-ends'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor|tertiary">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street|tertiary">
 				<line class='tunnel-casing highway-unclassified-casing tunnel' mask-class='tunnel-core highway-unclassified-core'/>
 				<line class='highway-unclassified-casing highway-tunnel-ends'/>
             </rule>
@@ -804,7 +823,7 @@
 					    <text k="name" startOffset='50%' class="waterway-name-core waterway-river-name-core" dy='2px' />
 					</rule>
 					
-					<rule e="way" k="highway" v="unclassified|residential|minor" layer="5">
+					<rule e="way" k="highway" v="unclassified|residential|minor|living_street" layer="5">
 					    <text k="name" startOffset='50%' class="highway-name highway-unclassified-name" dy='1.6px' />
 					</rule>
 					<rule e="way" k="highway" v="tertiary" layer="5">
@@ -1112,6 +1131,8 @@
             .highway-unclassified-area              { stroke-width: 3.5px;   stroke: #ffffff; fill: #ffffff; }
             .highway-unclassified-name              { stroke-width: 0px;     font-size: 4.5px; }
             .highway-unclassified-ref               { stroke-width: 0px;     font-size: 4.5px; }
+	    
+	    .highway-living_street-casing            { stroke-width: 3.7px;  stroke: #777777; stroke-dasharray: 1, 1; stroke-linecap: round; }
 
             .highway-service-bridge-casing          { stroke-width: 4.5px; }
             .highway-service-bridge-core            { stroke-width: 3.5px; }
@@ -1293,21 +1314,25 @@
 
             .waterway-river-casing                  { stroke-width: 6px; }
             .waterway-river-core                    { stroke-width: 4px; }
+	    .waterway-river-tunnelcore              { stroke-width: 4px; stroke-dasharray: 2 2; stroke-linecap: butt;}
 			.waterway-river-name-casing             { font-size: 6px; stroke-width: 0.4px;}
 			.waterway-river-name-core               { font-size: 6px; }
 
             .waterway-stream-casing                 { stroke-width: 1px; }
             .waterway-stream-core                   { stroke-width: 0.8px; }
+	    .waterway-stream-tunnelcore             { stroke-width: 0.8px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-stream-name-casing            { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-stream-name-core              { font-size: 3px; }
 
             .waterway-canal-casing                  { stroke-width: 4px; }
             .waterway-canal-core                    { stroke-width: 2px; }
+	    .waterway-canal-tunnelcore              { stroke-width: 2px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-canal-name-casing             { font-size: 6px; stroke-width: 0.4px;}
 			.waterway-canal-name-core               { font-size: 6px; }
 
             .waterway-drain-casing                  { stroke-width: 2px; }
             .waterway-drain-core                    { stroke-width: 1px; }
+	    .waterway-drain-tunnelcore              { stroke-width: 1px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-drain-name-casing             { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-drain-name-core               { font-size: 3px; }
 
diff -uNar orig/osm-map-features-z16.xml mod/osm-map-features-z16.xml
--- orig/osm-map-features-z16.xml	2008-01-23 10:38:08.000000000 +0100
+++ mod/osm-map-features-z16.xml	2008-01-24 19:24:04.000000000 +0100
@@ -151,30 +151,46 @@
         <rule e="way" k="waterway" v="riverbank">
             <area class='waterway-riverbank'/>
         </rule>
-        <rule e="segment|way" k="waterway" v="river">
-            <line class='waterway-casing waterway-river-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="stream">
-            <line class='waterway-casing waterway-stream-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="canal">
-            <line class='waterway-casing waterway-canal-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="drain">
-            <line class='waterway-casing waterway-drain-casing'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="river">
-            <line class='waterway-core waterway-river-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="stream">
-            <line class='waterway-core waterway-stream-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="canal">
-            <line class='waterway-core waterway-canal-core'/>
-        </rule>
-        <rule e="segment|way" k="waterway" v="drain">
-            <line class='waterway-core waterway-drain-core'/>
-        </rule>
+	<rule e="way" k="tunnel" v="true|yes">
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-tunnelcore'/>
+		</rule>
+	</rule>
+	<else>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-casing waterway-river-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-casing waterway-stream-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-casing waterway-canal-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-casing waterway-drain-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-core'/>
+		</rule>
+	</else>
         <rule e="way" k="waterway" v="dock">
             <area class='natural-water' />
         </rule>
@@ -239,7 +255,7 @@
             <rule e="way" k="highway" v="tertiary">
                 <line class='bridge-casing highway-tertiary-bridge-casing' smart-linecap='no'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <line class='bridge-casing highway-unclassified-bridge-casing' smart-linecap='no'/>
             </rule>
             <rule e="way" k="highway" v="service">
@@ -319,7 +335,7 @@
             <rule e="way" k="highway" v="tertiary">
                 <line class='bridge-core highway-tertiary-bridge-core' smart-linecap='no'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <line class='bridge-core highway-unclassified-bridge-core' smart-linecap='no'/>
             </rule>
             <rule e="way" k="highway" v="service">
@@ -413,6 +429,9 @@
             <rule e="way" k="highway" v="unclassified|residential|minor">
                 <line class='highway-casing highway-unclassified-casing' />
             </rule>
+	    <rule e="way" k="highway" v="living_street">
+		    <line class='highway-casing highway-living_street-casing' />
+            </rule>
             <rule e="way" k="highway" v="tertiary">
                 <line class='highway-casing highway-tertiary-casing' />
             </rule>
@@ -550,7 +569,7 @@
 					<line class='highway-core highway-service-core' />
 				</else>
 			</rule>
-			<rule e="way" k="highway" v="unclassified|residential|minor">
+			<rule e="way" k="highway" v="unclassified|residential|minor|living_street">
 				<rule e="way" k="area" v="yes|true">
  					<area class='highway-core highway-unclassified-area' />
 				</rule>
@@ -695,7 +714,7 @@
 				<line class='tunnel-casing highway-service-casing tunnel' mask-class='tunnel-core highway-service-core'/>
 				<line class='highway-service-casing highway-tunnel-ends'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor|tertiary">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street|tertiary">
 				<line class='tunnel-casing highway-unclassified-casing tunnel' mask-class='tunnel-core highway-unclassified-core'/>
 				<line class='highway-unclassified-casing highway-tunnel-ends'/>
             </rule>
@@ -980,7 +999,7 @@
         <!-- For everything, except trams, if it shares a node with a road then render a railroad crossing symbol.  -->
         <rule e="node" s="way" k="railway" v="rail|light_rail|subway|narrow_gauge|preserved|monorail">
 			<rule e="node" s="way" k="railway" v="rail">
-				<rule e="node" s="way" k="highway" v="motorway|trunk|primary|secondary|tertiary|minor|unclassified|residential|service|unsurfaced|track">
+				<rule e="node" s="way" k="highway" v="motorway|trunk|primary|secondary|tertiary|minor|living_street|unclassified|residential|service|unsurfaced|track">
 					<symbol xlink:href="#symbol-railway-crossing" width='7px' height='7px' transform='translate(-3.5,-3.5)' />
 				</rule>
 			</rule>
@@ -1105,7 +1124,7 @@
 					<rule e="way" k="highway" v="service" layer="5">
 					    <text k="name" startOffset='50%' class="highway-name highway-service-name" dy='0.7px' />
 					</rule>
-					<rule e="way" k="highway" v="unclassified|residential|minor" layer="5">
+					<rule e="way" k="highway" v="unclassified|residential|minor|living_street" layer="5">
 					    <text k="name" startOffset='50%' class="highway-name highway-unclassified-name" dy='0.7px' />
 					</rule>
 					<rule e="way" k="highway" v="tertiary" layer="5">
@@ -1495,6 +1514,8 @@
             .highway-unclassified-area              { stroke-width: 2.25px;   stroke: #ffffff; fill: #ffffff; }
             .highway-unclassified-name              { stroke-width: 0px;     font-size: 2.5px; }
             .highway-unclassified-ref               { stroke-width: 0px;     font-size: 3px; }
+	    
+	    .highway-living_street-casing            { stroke-width: 2.5px;  stroke: #777777; stroke-dasharray: 0.5, 0.8; stroke-linecap: round; }
 
             .highway-service-bridge-casing          { stroke-width: 2.8px; }
             .highway-service-bridge-core            { stroke-width: 2.6px; }
@@ -1677,21 +1698,25 @@
 
             .waterway-river-casing                  { stroke-width: 6px; }
             .waterway-river-core                    { stroke-width: 4px; }
+	    .waterway-river-tunnelcore                    { stroke-width: 4px; stroke-dasharray: 2 3; stroke-linecap: butt;}
 			.waterway-river-name-casing             { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-river-name-core               { font-size: 3px; }
 
             .waterway-stream-casing                 { stroke-width: 1px; }
             .waterway-stream-core                   { stroke-width: 0.8px; }
+	    .waterway-stream-tunnelcore                    { stroke-width: 0.8px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-stream-name-casing            { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-stream-name-core              { font-size: 3px; }
 
             .waterway-canal-casing                  { stroke-width: 4px; }
             .waterway-canal-core                    { stroke-width: 2px; }
+	    .waterway-canal-tunnelcore                    { stroke-width: 2px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-canal-name-casing             { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-canal-name-core               { font-size: 3px; }
 
             .waterway-drain-casing                  { stroke-width: 2px; }
             .waterway-drain-core                    { stroke-width: 1px; }
+	    .waterway-drain-tunnelcore                    { stroke-width: 1px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-drain-name-casing             { font-size: 3px; stroke-width: 0.2px;}
 			.waterway-drain-name-core               { font-size: 3px; }
 
diff -uNar orig/osm-map-features-z17.xml mod/osm-map-features-z17.xml
--- orig/osm-map-features-z17.xml	2008-01-23 10:38:08.000000000 +0100
+++ mod/osm-map-features-z17.xml	2008-01-24 19:24:04.000000000 +0100
@@ -142,7 +142,7 @@
         <rule e="way" k="osmarender:renderUser" v="~|yes">
             <rule e="way" k="tunnel" v="~|no|false">    <!-- no names in tunnels -->
 				<rule e="way" k="junction" v="~"> <!-- no names on or along junctions -->
-					<rule e="way" k="highway" v="unclassified|residential|minor">
+					<rule e="way" k="highway" v="unclassified|residential|minor|living_street">
 					    <text startOffset='50%' class="highway-name highway-user" dy='1.7px'><tag k="osm:user" default='&#169; OpenStreetMap'/></text>
 					</rule>
 					<rule e="way" k="highway" v="tertiary">
@@ -179,30 +179,46 @@
         <rule e="way" k="waterway" v="riverbank">
             <area class='waterway-riverbank'/>
         </rule>
-        <rule e="way" k="waterway" v="river">
-            <line class='waterway-casing waterway-river-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="stream">
-            <line class='waterway-casing waterway-stream-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="canal">
-            <line class='waterway-casing waterway-canal-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="drain">
-            <line class='waterway-casing waterway-drain-casing'/>
-        </rule>
-        <rule e="way" k="waterway" v="river">
-            <line class='waterway-core waterway-river-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="stream">
-            <line class='waterway-core waterway-stream-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="canal">
-            <line class='waterway-core waterway-canal-core'/>
-        </rule>
-        <rule e="way" k="waterway" v="drain">
-            <line class='waterway-core waterway-drain-core'/>
-        </rule>
+	<rule e="way" k="tunnel" v="true|yes">
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-tunnelcore'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-tunnelcore'/>
+        	</rule>
+	</rule>
+	<else>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-casing waterway-river-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-casing waterway-stream-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-casing waterway-canal-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-casing waterway-drain-casing'/>
+		</rule>
+		<rule e="way" k="waterway" v="river">
+			<line class='waterway-core waterway-river-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="stream">
+			<line class='waterway-core waterway-stream-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="canal">
+			<line class='waterway-core waterway-canal-core'/>
+		</rule>
+		<rule e="way" k="waterway" v="drain">
+			<line class='waterway-core waterway-drain-core'/>
+        	</rule>
+	</else>
         <rule e="way" k="waterway" v="dock">
             <area class='natural-water' />
         </rule>
@@ -267,7 +283,7 @@
             <rule e="way" k="highway" v="tertiary">
                 <line class='bridge-casing highway-tertiary-bridge-casing' smart-linecap='no'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <line class='bridge-casing highway-unclassified-bridge-casing' smart-linecap='no'/>
             </rule>
             <rule e="way" k="highway" v="service">
@@ -346,7 +362,7 @@
             <rule e="way" k="highway" v="tertiary">
                 <line class='bridge-core highway-tertiary-bridge-core' smart-linecap='no'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <line class='bridge-core highway-unclassified-bridge-core' smart-linecap='no'/>
             </rule>
             <rule e="way" k="highway" v="service">
@@ -441,6 +457,9 @@
             <rule e="way" k="highway" v="unclassified|residential|minor">
                 <line class='highway-casing highway-unclassified-casing' />
             </rule>
+	    <rule e="way" k="highway" v="living_street">
+		    <line class='highway-casing highway-living_street-casing' />
+            </rule>
             <rule e="way" k="highway" v="tertiary">
                 <line class='highway-casing highway-tertiary-casing' />
             </rule>
@@ -586,7 +605,7 @@
                     <line class='highway-core highway-service-core' />
 		</else>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street">
                 <rule e="way" k="area" v="yes|true">
                      <area class='highway-core highway-unclassified-area' />
                  </rule>
@@ -736,7 +755,7 @@
 				<line class='tunnel-casing highway-service-casing tunnel' mask-class='tunnel-core highway-service-core'/>
 				<line class='highway-service-casing highway-tunnel-ends'/>
             </rule>
-            <rule e="way" k="highway" v="unclassified|residential|minor|tertiary">
+            <rule e="way" k="highway" v="unclassified|residential|minor|living_street|tertiary">
 				<line class='tunnel-casing highway-unclassified-casing tunnel' mask-class='tunnel-core highway-unclassified-core'/>
 				<line class='highway-unclassified-casing highway-tunnel-ends'/>
             </rule>
@@ -1028,7 +1047,7 @@
         <!-- For everything, except trams, if it shares a node with a road then render a railroad crossing symbol.  -->
         <rule e="node" s="way" k="railway" v="rail|light_rail|subway|narrow_gauge|preserved|monorail">
 			<rule e="node" s="way" k="railway" v="rail">
-				<rule e="node" s="way" k="highway" v="motorway|trunk|primary|secondary|tertiary|minor|unclassified|residential|service|unsurfaced|track">
+				<rule e="node" s="way" k="highway" v="motorway|trunk|primary|secondary|tertiary|minor|living_street|unclassified|residential|service|unsurfaced|track">
 					<symbol xlink:href="#symbol-railway-crossing" width='3.5px' height='3.5px' transform='translate(-1.75,-1.75)' />
 				</rule>
 			</rule>
@@ -1268,7 +1287,7 @@
 					<rule e="way" k="highway" v="service" layer="5">
 					    <text k="name" startOffset='50%' class="highway-name highway-service-name" dy='0.35px' />
 					</rule>
-					<rule e="way" k="highway" v="unclassified|residential|minor" layer="5">
+					<rule e="way" k="highway" v="unclassified|residential|minor|living_street" layer="5">
 					    <text k="name" startOffset='50%' class="highway-name highway-unclassified-name" dy='0.35px' />
 					</rule>
 					<rule e="way" k="highway" v="tertiary" layer="5">
@@ -1744,6 +1763,8 @@
             .highway-unclassified-area              { stroke-width: 1.25px;   stroke: #ffffff; fill: #ffffff; }
             .highway-unclassified-name              { stroke-width: 0px;     font-size: 1.25px; }
             .highway-unclassified-ref               { stroke-width: 0px;     font-size: 1.5px; }
+	    
+	    .highway-living_street-casing           { stroke-width: 1.5px;  stroke: #777777; stroke-dasharray: 0.5, 0.8; stroke-linecap: round; }
 
             .highway-service-bridge-casing          { stroke-width: 2.25px; }
             .highway-service-bridge-core            { stroke-width: 1.75px; }
@@ -1926,21 +1947,25 @@
 
             .waterway-river-casing                  { stroke-width: 4px; }
             .waterway-river-core                    { stroke-width: 3px; }
+	    .waterway-river-tunnelcore                    { stroke-width: 3px; stroke-dasharray: 2 3; stroke-linecap: butt;}
 			.waterway-river-name-casing             { font-size: 1.5px; stroke-width: 0.1px;}
 			.waterway-river-name-core               { font-size: 1.5px; }
 
             .waterway-stream-casing                 { stroke-width: 0.5px; }
             .waterway-stream-core                   { stroke-width: 0.4px; }
+	    .waterway-stream-tunnelcore                    { stroke-width: 0.4px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-stream-name-casing            { stroke-width: 0.1px;     font-size: 1.5px; }
 			.waterway-stream-name-core              { font-size: 1.5px; }
 
             .waterway-canal-casing                  { stroke-width: 2px; }
             .waterway-canal-core                    { stroke-width: 1px; }
+	    .waterway-canal-tunnelcore                    { stroke-width: 1px; stroke-dasharray: 1 1; stroke-linecap: butt;}
 			.waterway-canal-name-casing             { stroke-width: 0.1px;     font-size: 1.5px; }
 			.waterway-canal-name-core               { font-size: 1.5px; }
 
             .waterway-drain-casing                  { stroke-width: 1px; }
             .waterway-drain-core                    { stroke-width: 0.5px; }
+	    .waterway-drain-tunnelcore                    { stroke-width: 0.5px; stroke-dasharray: 0.5 0.5; stroke-linecap: butt;}
 			.waterway-drain-name-casing             { stroke-width: 0.1px;     font-size: 1.5px; }
 			.waterway-drain-name-core               { font-size: 1.5px; }