Index: osm-map-features-z6.xml
===================================================================
--- osm-map-features-z6.xml	(revision 8215)
+++ osm-map-features-z6.xml	(working copy)
@@ -174,7 +174,7 @@
 
 
         <!-- Highway casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
@@ -229,7 +229,7 @@
         </rule>
 
         <!-- Paths not in tunnels -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
             <rule e="way" k="highway" v="footway|steps">
                 <line class='highway-core highway-footway' />
             </rule>
Index: osm-map-features-z7.xml
===================================================================
--- osm-map-features-z7.xml	(revision 8215)
+++ osm-map-features-z7.xml	(working copy)
@@ -174,7 +174,7 @@
 
 
         <!-- Highway casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
@@ -229,7 +229,7 @@
         </rule>
 
         <!-- Paths not in tunnels -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
             <rule e="way" k="highway" v="footway|steps">
                 <line class='highway-core highway-footway' />
             </rule>
Index: rules/standard.xml
===================================================================
--- rules/standard.xml	(revision 8215)
+++ rules/standard.xml	(working copy)
@@ -249,7 +249,7 @@
         <layer name="Roads and Paths">
 
             <!-- Highway casings -->
-            <rule e="segment|way" k="tunnel" v="~|no">
+            <rule e="segment|way" k="tunnel" v="~|no|false">
                 <rule e="segment|way" k="highway" v="pedestrian">
                     <line class='highway-pedestrian-casing' />
                 </rule>
@@ -302,7 +302,7 @@
             </rule>
 
             <!-- Paths not in tunnels -->
-            <rule e="segment|way" k="tunnel" v="~|no">
+            <rule e="segment|way" k="tunnel" v="~|no|false">
                 <rule e="segment|way" k="highway" v="footway|steps">
                     <line class='highway-footway' />
                     <text k="ref" class='highway-footway-ref' dx='2px' dy='-2px' />
Index: osm-map-features-z10.xml
===================================================================
--- osm-map-features-z10.xml	(revision 8215)
+++ osm-map-features-z10.xml	(working copy)
@@ -167,7 +167,7 @@
         </rule>
 
         <!-- Highway casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
@@ -222,7 +222,7 @@
         </rule>
 
         <!-- Paths not in tunnels -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
             <rule e="way" k="highway" v="footway|steps">
                 <line class='highway-core highway-footway' />
             </rule>
@@ -434,19 +434,19 @@
         </rule>
 
 	</rule> <!-- k="osmarender:render" v="~|yes" -->
-
-    <!-- ==================================== Layer 5 ================================== -->
-    <rule e="node|way" k="osmarender:render" v="~|yes" layer="5">
-		<!-- Non-physical boundaries -->
-		<rule e="way" k="boundary" v="administrative" layer="5">
-			<rule e="way" k="border_type" v="state" layer="5">
-				<line class="boundary boundary-administrative-state-casing" />
-				<line class="boundary boundary-administrative-state-core" />
-			</rule>	
-			<else>
-				<line class="boundary boundary-administrative-state-core" />
-			</else>	
-		</rule>
+
+    <!-- ==================================== Layer 5 ================================== -->
+    <rule e="node|way" k="osmarender:render" v="~|yes" layer="5">
+		<!-- Non-physical boundaries -->
+		<rule e="way" k="boundary" v="administrative" layer="5">
+			<rule e="way" k="border_type" v="state" layer="5">
+				<line class="boundary boundary-administrative-state-casing" />
+				<line class="boundary boundary-administrative-state-core" />
+			</rule>	
+			<else>
+				<line class="boundary boundary-administrative-state-core" />
+			</else>	
+		</rule>
     </rule>
 
     <!-- SVG Definitions - markers, symbols etc go here -->
Index: osm-map-features-z11.xml
===================================================================
--- osm-map-features-z11.xml	(revision 8215)
+++ osm-map-features-z11.xml	(working copy)
@@ -167,7 +167,7 @@
         </rule>
 
         <!-- Highway casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
@@ -222,7 +222,7 @@
         </rule>
 
         <!-- Paths not in tunnels -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
             <rule e="way" k="highway" v="footway|steps">
                 <line class='highway-core highway-footway' />
             </rule>
@@ -433,20 +433,20 @@
 			</rule>
         </rule>
 
-	</rule> <!-- k="osmarender:render" v="~|yes" -->
-    
-    <!-- ==================================== Layer 5 ================================== -->
-    <rule e="node|way" k="osmarender:render" v="~|yes" layer="5">
-		<!-- Non-physical boundaries -->
-		<rule e="way" k="boundary" v="administrative" layer="5">
-			<rule e="way" k="border_type" v="state" layer="5">
-				<line class="boundary boundary-administrative-state-casing" />
-				<line class="boundary boundary-administrative-state-core" />
-			</rule>	
-			<else>
-				<line class="boundary boundary-administrative-state-core" />
-			</else>	
-		</rule>
+	</rule> <!-- k="osmarender:render" v="~|yes" -->
+    
+    <!-- ==================================== Layer 5 ================================== -->
+    <rule e="node|way" k="osmarender:render" v="~|yes" layer="5">
+		<!-- Non-physical boundaries -->
+		<rule e="way" k="boundary" v="administrative" layer="5">
+			<rule e="way" k="border_type" v="state" layer="5">
+				<line class="boundary boundary-administrative-state-casing" />
+				<line class="boundary boundary-administrative-state-core" />
+			</rule>	
+			<else>
+				<line class="boundary boundary-administrative-state-core" />
+			</else>	
+		</rule>
     </rule>
 
 
Index: captionless-z12.xml
===================================================================
--- captionless-z12.xml	(revision 8215)
+++ captionless-z12.xml	(working copy)
@@ -126,7 +126,7 @@
 
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
Index: osm-map-features-z12.xml
===================================================================
--- osm-map-features-z12.xml	(revision 8215)
+++ osm-map-features-z12.xml	(working copy)
@@ -175,7 +175,7 @@
 
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
@@ -1416,10 +1416,10 @@
           stroke="none">
             <svg:path d="M 9.2,5 C 9.2,4.5 9.8,3.2 10,3 L 9,3 L 8,4 L 5.5,4 L 8,0 L 6,0 L 3,4 C 2,4 1,4.2 0.5,4.5 C 0,5 0,5 0.5,5.5 C 1,5.8 2,6 3,6 L 6,10 L 8,10 L 5.5,6 L 7.8,6 L 9,7 L 10,7 C 9.8,6.8 9.2,5.5 9.2,5 z " />
         </svg:symbol>
-
-
-		<svg:symbol id="symbol-peak" viewBox="0 0 100 100">
-			<svg:path  fill="#d1adc6" stroke="#1f151d" stroke-width="5" d="M 0,90 L 50,10 L 100,90 Z"/>
+
+
+		<svg:symbol id="symbol-peak" viewBox="0 0 100 100">
+			<svg:path  fill="#d1adc6" stroke="#1f151d" stroke-width="5" d="M 0,90 L 50,10 L 100,90 Z"/>
 		</svg:symbol>
 
 
Index: osm-map-features-z13.xml
===================================================================
--- osm-map-features-z13.xml	(revision 8215)
+++ osm-map-features-z13.xml	(working copy)
@@ -189,7 +189,7 @@
 
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
Index: osm-map-features-z14.xml
===================================================================
--- osm-map-features-z14.xml	(revision 8215)
+++ osm-map-features-z14.xml	(working copy)
@@ -213,7 +213,7 @@
 
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
Index: osm-map-features-z15.xml
===================================================================
--- osm-map-features-z15.xml	(revision 8215)
+++ osm-map-features-z15.xml	(working copy)
@@ -225,7 +225,7 @@
 
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
Index: osm-map-features-z16.xml
===================================================================
--- osm-map-features-z16.xml	(revision 8215)
+++ osm-map-features-z16.xml	(working copy)
@@ -387,7 +387,7 @@
         </rule>
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />
Index: osm-map-features-z17.xml
===================================================================
--- osm-map-features-z17.xml	(revision 8215)
+++ osm-map-features-z17.xml	(working copy)
@@ -426,7 +426,7 @@
 
 
         <!-- Linear casings -->
-        <rule e="way" k="tunnel" v="~|no">
+        <rule e="way" k="tunnel" v="~|no|false">
 			<rule e="way" k="highway" v="raceway">
 				<rule e="way" k="use_status" v="~">
 					<line class='highway-raceway-casing' />