diff --git a/Tapiola.xml b/Tapiola.xml
index 5ee3243..4f73e02 100644
--- a/Tapiola.xml
+++ b/Tapiola.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme.xsd" version="5" base-stroke-width="0.9" map-background="#F8F8F8" map-background-outside="#EEEEEE">
 <!--
 
-Tapiola 1.4.0 - 2024-01-22 - Mapsforge Rendertheme for Apps with Mapsforge support and Openandromaps
+Tapiola 1.4.0 - 2024-01-24 - Mapsforge Rendertheme for Apps with Mapsforge support and Openandromaps
 
 Tapiola is based on Settler v2.0.25 from Andrey Nekrasov, andrey.nekrasov@gmail.com - https://github.com/andrey-nekrasov/oam_theme_settler
 Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github.com/FrankSchoeneck/active_RT5
@@ -91,18 +91,18 @@ Contact: Michael Scheer <theme@tapiola.org>
 			<cat id="barriers" />
 		</layer>
 		<layer id="L_access" enabled="true" visible="false">
-			<name lang="en" value="⛔ Access restriction indicators" />
-			<name lang="de" value="⛔ Symbole für Zugangsbeschränkungen" />
+			<name lang="en" value="┗ ⛔ Access restriction indicators" />
+			<name lang="de" value="┗ ⛔ Symbole für Zugangsbeschränkungen" />
 			<cat id="access" />
 		</layer>
 		<layer id="L_unpaved" enabled="false" visible="false">
-			<name lang="en" value="♒ Unpaved road indicators" />
-			<name lang="de" value="♒ Symbole für unbefestigte Straßen" />
+			<name lang="en" value="┗ ♒ Unpaved road indicators" />
+			<name lang="de" value="┗ ♒ Symbole für unbefestigte Straßen" />
 			<cat id="unpaved" />
 		</layer>
 		<layer id="L_grades" enabled="false" visible="false">
-			<name lang="en" value="3️⃣ Track grade codes" />
-			<name lang="de" value="3️⃣ Oberflächengüte und Tragfähigkeit"/>
+			<name lang="en" value="┗ 3️⃣ Track grade codes" />
+			<name lang="de" value="┗ 3️⃣ Oberflächengüte und Tragfähigkeit"/>
 			<cat id="grades" />
 		</layer>
 		<layer id="L_sports" enabled="true" visible="false">
@@ -356,16 +356,16 @@ Contact: Michael Scheer <theme@tapiola.org>
 			<overlay id="L_railway" />
 			<overlay id="L_highway" />
 			<overlay id="L_road_captions" />
+			<overlay id="L_grades" />
+			<overlay id="L_unpaved" />
+			<overlay id="L_access" />
 			<overlay id="L_buildings" />
 			<overlay id="L_building_type" />
 			<overlay id="L_house_nr" />
 			<overlay id="L_cities_towns" />
 			<overlay id="L_cities_towns_sub" />
-			<overlay id="L_barriers" />
-			<overlay id="L_access" />
-			<overlay id="L_grades" />
-			<overlay id="L_unpaved" />
 			<overlay id="L_publictransport" />
+			<overlay id="L_barriers" />
 			<overlay id="L_parking" />
 			<overlay id="L_parking_lowzoom" />
 			<overlay id="L_sports" />
@@ -491,14 +491,11 @@ Contact: Michael Scheer <theme@tapiola.org>
 
 	<rule e="any" k="landuse" v="*" zoom-min="8">
 		<rule e="way" k="landuse" v="residential|farmyard" zoom-min="10">
-			<rule e="way" k="*" v="*" zoom-max="13">
+			<rule e="way" k="*" v="*" zoom-max="14">
 				<area fill="#e4d9d9" />
 			</rule>
-			<rule e="way" k="*" v="*" zoom-min="14" zoom-max="14">
-				<area fill="#33aaaaaa" />
-			</rule>
 			<rule e="way" k="*" v="*" zoom-min="15">
-				<area fill="#26aaaaaa" />
+				<area fill="#e6e6e6" />
 			</rule>
 			<rule e="way" cat="cities_towns_sub" k="*" v="*" zoom-min="15" zoom-max="19">
 				<caption k="name" priority="99" font-family="sans_serif" font-style="italic" font-size="12" fill="#000000" stroke="#ffffff" stroke-width="2.0" text-wrap-width="145" />
@@ -1433,7 +1430,7 @@ Contact: Michael Scheer <theme@tapiola.org>
 		</rule>
 	</rule>
 	<rule e="way" k="area" v="yes|true">
-		<rule e="way" k="highway" v="*">
+		<rule e="way" cat="c_highway" k="highway" v="*">
 			<rule e="way" k="highway" v="footway|path" zoom-min="13">
 				<area fill="#E8D1E2" stroke="#585858" stroke-width="0.1" />
 			</rule>
@@ -1490,7 +1487,7 @@ Contact: Michael Scheer <theme@tapiola.org>
 		</rule>
 	</rule>
 
-	<!-- Building coloring -->
+	<!-- Buildings -->
 	<rule e="any" cat="buildings" k="*" v="*" >
 		<rule e="any" k="building" v="*" zoom-min="14">
 			<rule e="any" k="*" v="*" zoom-max="15" >
@@ -1544,103 +1541,107 @@ Contact: Michael Scheer <theme@tapiola.org>
 	<rule e="any" k="highway|railway" v="*">
 		<rule e="any" k="area" v="~|no|false">
 			<rule e="way" k="tunnel" v="yes">
-				<rule e="way" cat="c_railway" k="railway" v="abandoned" zoom-min="13">
-					<line stroke="#40FFFFFF" stroke-width="0.5" scale="all" stroke-dasharray="4.8,2.3,2.5,0" stroke-linecap="butt" />
-					<line stroke="#30808080" stroke-width="0.5" scale="all" stroke-dasharray="2.3,7.3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_railway" k="railway" v="miniature" zoom-min="13">
-					<line stroke="#28000000" stroke-width="0.14" scale="all" stroke-dasharray="2.4,1.2" stroke-linecap="butt" />
-					<line stroke="#80FFFFFF" stroke-width="0.14" scale="all" stroke-dasharray="0,2.4,1.2,0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_railway" k="railway" v="disused" zoom-min="13">
-					<line stroke="#40000000" dy="0.33" stroke-width="0.075" stroke-linecap="butt" />
-					<line stroke="#40000000" dy="-0.33" stroke-width="0.075" stroke-linecap="butt" />
-					<line stroke="#30000000" stroke-width="0.6" scale="all" stroke-dasharray="0.1,2.3" stroke-linecap="butt" />
-					<line stroke="#30FFFFFF" stroke-width="0.6" scale="all" stroke-dasharray="0,0.1,2.3,0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="railway|highway" v="tram|light_rail|bus_guideway" zoom-min="10">
-					<line stroke="#408C4600" stroke-width="0.5" stroke-linecap="butt" />
-					<line stroke="#60ffffff" stroke-width="0.4" scale="all" stroke-dasharray="1.8,1.8" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_railway" k="railway" v="subway" zoom-min="13">
-					<line stroke="#00BF8F93" stroke-width="0.5" stroke-dasharray="8,6" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_railway" k="railway" v="narrow_gauge|preserved|funicular" zoom-min="10">
-					<line stroke="#40000000" dy="0.28" stroke-width="0.075" stroke-linecap="butt" />
-					<line stroke="#40000000" dy="-0.28" stroke-width="0.075" stroke-linecap="butt" />
-					<line stroke="#30000000" stroke-width="0.6" scale="all" stroke-dasharray="1.2,2.4" stroke-linecap="butt" />
-					<line stroke="#30FFFFFF" stroke-width="0.6" scale="all" stroke-dasharray="0,1.2,2.4,0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_railway" k="railway" v="rail" zoom-min="10">
-					<line stroke="#40000000" dy="0.33" stroke-width="0.075" stroke-linecap="butt" />
-					<line stroke="#40000000" dy="-0.33" stroke-width="0.075" stroke-linecap="butt" />
-					<line stroke="#30000000" stroke-width="0.6" scale="all" stroke-dasharray="2.4,2.4" stroke-linecap="butt" />
-					<line stroke="#30FFFFFF" stroke-width="0.6" scale="all" stroke-dasharray="0,2.4,2.4,0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="motorway" zoom-min="6">
-					<line stroke="#502f8bd6" stroke-width="2.2" stroke-linecap="butt" />
-					<line stroke="#707070" dy="1.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-1.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="motorway_link" zoom-min="11" >
-					<line stroke="#502f8bd6" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="trunk" zoom-min="6">
-					<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="trunk_link" zoom-min="11">
-					<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="primary|primary_link" zoom-min="9">
-					<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="secondary|secondary_link" zoom-min="9">
-					<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="tertiary|tertiary_link" zoom-min="11">
-					<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="residential|unclassified" zoom-min="13">
-					<line stroke="#50FFFFFF" stroke-width="1.0" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="living" zoom-min="13">
-					<line stroke="#50FFFFFF" stroke-width="1.0" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="service" zoom-min="13">
-					<line stroke="#50FFFFFF" stroke-width="1.0" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="steps|footway|path|bridleway" zoom-min="14">
-					<line stroke="#50FFFFFF" stroke-width="0.4" stroke-linecap="butt" />
-					<line stroke="#A6707070" dy="0.2" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#A6707070" dy="-0.2" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="track|byway" zoom-min="13">
-					<line stroke="#50FFFFFF" stroke-width="0.6" stroke-linecap="butt" />
-					<line stroke="#3f3f3f" dy="0.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#3f3f3f" dy="-0.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="cycling" zoom-min="14">
-					<line stroke="#50FFFFFF" stroke-width="0.7" stroke-linecap="butt" />
-					<line stroke="#707070" dy="0.35" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
-					<line stroke="#707070" dy="-0.35" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+			<rule e="way" cat="c_railway" k="railway" v="*" >
+					<rule e="way" k="railway" v="abandoned" zoom-min="13">
+						<line stroke="#40FFFFFF" stroke-width="0.5" scale="all" stroke-dasharray="4.8,2.3,2.5,0" stroke-linecap="butt" />
+						<line stroke="#30808080" stroke-width="0.5" scale="all" stroke-dasharray="2.3,7.3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="railway" v="miniature" zoom-min="13">
+						<line stroke="#28000000" stroke-width="0.14" scale="all" stroke-dasharray="2.4,1.2" stroke-linecap="butt" />
+						<line stroke="#80FFFFFF" stroke-width="0.14" scale="all" stroke-dasharray="0,2.4,1.2,0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="railway" v="disused" zoom-min="13">
+						<line stroke="#40000000" dy="0.33" stroke-width="0.075" stroke-linecap="butt" />
+						<line stroke="#40000000" dy="-0.33" stroke-width="0.075" stroke-linecap="butt" />
+						<line stroke="#30000000" stroke-width="0.6" scale="all" stroke-dasharray="0.1,2.3" stroke-linecap="butt" />
+						<line stroke="#30FFFFFF" stroke-width="0.6" scale="all" stroke-dasharray="0,0.1,2.3,0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="railway|highway" v="tram|light_rail|bus_guideway" zoom-min="10">
+						<line stroke="#408C4600" stroke-width="0.5" stroke-linecap="butt" />
+						<line stroke="#60ffffff" stroke-width="0.4" scale="all" stroke-dasharray="1.8,1.8" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="railway" v="subway" zoom-min="13">
+						<line stroke="#00BF8F93" stroke-width="0.5" stroke-dasharray="8,6" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="railway" v="narrow_gauge|preserved|funicular" zoom-min="10">
+						<line stroke="#40000000" dy="0.28" stroke-width="0.075" stroke-linecap="butt" />
+						<line stroke="#40000000" dy="-0.28" stroke-width="0.075" stroke-linecap="butt" />
+						<line stroke="#30000000" stroke-width="0.6" scale="all" stroke-dasharray="1.2,2.4" stroke-linecap="butt" />
+						<line stroke="#30FFFFFF" stroke-width="0.6" scale="all" stroke-dasharray="0,1.2,2.4,0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="railway" v="rail" zoom-min="10">
+						<line stroke="#40000000" dy="0.33" stroke-width="0.075" stroke-linecap="butt" />
+						<line stroke="#40000000" dy="-0.33" stroke-width="0.075" stroke-linecap="butt" />
+						<line stroke="#30000000" stroke-width="0.6" scale="all" stroke-dasharray="2.4,2.4" stroke-linecap="butt" />
+						<line stroke="#30FFFFFF" stroke-width="0.6" scale="all" stroke-dasharray="0,2.4,2.4,0" stroke-linecap="butt" />
+					</rule>
+				</rule>
+				<rule e="way" cat="c_highway" k="highway" v="*" >
+					<rule e="way" k="highway" v="motorway" zoom-min="6">
+						<line stroke="#502f8bd6" stroke-width="2.2" stroke-linecap="butt" />
+						<line stroke="#707070" dy="1.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-1.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="motorway_link" zoom-min="11" >
+						<line stroke="#502f8bd6" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="trunk" zoom-min="6">
+						<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="trunk_link" zoom-min="11">
+						<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="primary|primary_link" zoom-min="9">
+						<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="secondary|secondary_link" zoom-min="9">
+						<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="tertiary|tertiary_link" zoom-min="11">
+						<line stroke="#50FFFFFF" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="residential|unclassified" zoom-min="13">
+						<line stroke="#50FFFFFF" stroke-width="1.0" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="living" zoom-min="13">
+						<line stroke="#50FFFFFF" stroke-width="1.0" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="service" zoom-min="13">
+						<line stroke="#50FFFFFF" stroke-width="1.0" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.5" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="steps|footway|path|bridleway" zoom-min="14">
+						<line stroke="#50FFFFFF" stroke-width="0.4" stroke-linecap="butt" />
+						<line stroke="#A6707070" dy="0.2" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#A6707070" dy="-0.2" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="track|byway" zoom-min="13">
+						<line stroke="#50FFFFFF" stroke-width="0.6" stroke-linecap="butt" />
+						<line stroke="#3f3f3f" dy="0.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#3f3f3f" dy="-0.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="cycling" zoom-min="14">
+						<line stroke="#50FFFFFF" stroke-width="0.7" stroke-linecap="butt" />
+						<line stroke="#707070" dy="0.35" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+						<line stroke="#707070" dy="-0.35" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
+					</rule>
 				</rule>
 			</rule>
 			<rule e="any" k="tunnel" v="~|no|false">
@@ -1686,77 +1687,79 @@ Contact: Michael Scheer <theme@tapiola.org>
 				</rule>
 			</rule>
 			<rule e="way" k="bridge" v="yes|movable|true">
-				<rule e="way" k="highway" v="steps|footway|path" zoom-min="14">
-					<line stroke="#666666" stroke-width="1.0" stroke-linecap="butt" />
-					<line stroke="#EEEEEE" stroke-width="0.6" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="pedestrian" zoom-min="14">
-					<line stroke="#222222" stroke-width="1.8" stroke-linecap="butt" />
-					<line stroke="#EEEEEE" stroke-width="1.5" stroke-linecap="butt" />
-					<line stroke="#606060" stroke-width="1.3" />
-				</rule>
-				<rule e="way" k="highway" v="via_ferrata" zoom-min="15">
-					<line stroke="#111111" stroke-width="1.0" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="0.7" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="construction" zoom-min="11">
-					<line stroke="#353535" stroke-width="2.9" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.5" stroke-linecap="butt" />
-					<line stroke="#666666" stroke-width="2.1" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="motorway" zoom-min="6">
-					<line stroke="#353535" stroke-width="3.4" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="3.0" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="2.4" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="motorway_link" zoom-min="11">
-					<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="trunk" zoom-min="6">
-					<line stroke="#353535" stroke-width="3.0" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.6" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="2.2" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="trunk_link" zoom-min="11">
-					<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="primary|primary_link" zoom-min="9">
-					<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="secondary|secondary_link" zoom-min="9">
-					<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="tertiary|tertiary_link" zoom-min="11">
-					<line stroke="#353535" stroke-width="2.6" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="2.2" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="1.8" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="residential|unclassified" zoom-min="13">
-					<line stroke="#353535" stroke-width="1.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="1.2" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="living_street" zoom-min="13">
-					<line stroke="#353535" stroke-width="1.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="1.2" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="service" zoom-min="13">
-					<line stroke="#303030" stroke-width="1.8" stroke-linecap="butt" />
-					<line stroke="#ffffff" stroke-width="1.4" stroke-linecap="butt" />
-					<line stroke="#575757" stroke-width="1.2" stroke-linecap="butt" />
-				</rule>
-				<rule e="way" k="highway" v="track|byway" zoom-min="13">
-					<line stroke="#53534e" stroke-width="1.7" stroke-linecap="butt" />
-					<line stroke="#FFFFFF" stroke-width="1.3" stroke-linecap="butt" />
+				<rule e="way" cat="c_highway" k="*" v="*" >
+					<rule e="way" k="highway" v="steps|footway|path" zoom-min="14">
+						<line stroke="#666666" stroke-width="1.0" stroke-linecap="butt" />
+						<line stroke="#EEEEEE" stroke-width="0.6" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="pedestrian" zoom-min="14">
+						<line stroke="#222222" stroke-width="1.8" stroke-linecap="butt" />
+						<line stroke="#EEEEEE" stroke-width="1.5" stroke-linecap="butt" />
+						<line stroke="#606060" stroke-width="1.3" />
+					</rule>
+					<rule e="way" k="highway" v="via_ferrata" zoom-min="15">
+						<line stroke="#111111" stroke-width="1.0" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="0.7" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="construction" zoom-min="11">
+						<line stroke="#353535" stroke-width="2.9" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.5" stroke-linecap="butt" />
+						<line stroke="#666666" stroke-width="2.1" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="motorway" zoom-min="6">
+						<line stroke="#353535" stroke-width="3.4" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="3.0" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="2.4" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="motorway_link" zoom-min="11">
+						<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="trunk" zoom-min="6">
+						<line stroke="#353535" stroke-width="3.0" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.6" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="2.2" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="trunk_link" zoom-min="11">
+						<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="primary|primary_link" zoom-min="9">
+						<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="secondary|secondary_link" zoom-min="9">
+						<line stroke="#353535" stroke-width="2.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="2.0" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="tertiary|tertiary_link" zoom-min="11">
+						<line stroke="#353535" stroke-width="2.6" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="2.2" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="1.8" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="residential|unclassified" zoom-min="13">
+						<line stroke="#353535" stroke-width="1.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="1.2" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="living_street" zoom-min="13">
+						<line stroke="#353535" stroke-width="1.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="1.2" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="service" zoom-min="13">
+						<line stroke="#303030" stroke-width="1.8" stroke-linecap="butt" />
+						<line stroke="#ffffff" stroke-width="1.4" stroke-linecap="butt" />
+						<line stroke="#575757" stroke-width="1.2" stroke-linecap="butt" />
+					</rule>
+					<rule e="way" k="highway" v="track|byway" zoom-min="13">
+						<line stroke="#53534e" stroke-width="1.7" stroke-linecap="butt" />
+						<line stroke="#FFFFFF" stroke-width="1.3" stroke-linecap="butt" />
+					</rule>
 				</rule>
 			</rule>
 			<rule e="way" k="bridge" v="boardwalk">
@@ -1766,7 +1769,7 @@ Contact: Michael Scheer <theme@tapiola.org>
 				</rule>
 			</rule>
 			<rule e="any" k="tunnel" v="~|no|false">
-				<rule e="way" k="highway" v="path|footway" zoom-min="14">
+				<rule e="way" cat="c_highway" k="highway" v="path|footway" zoom-min="14">
 					<rule e="way" k="via_ferrata_flag|via_ferrata_scale|via_ferrata" v="~">
 						<!-- Paths with surface:asphalt/paved like paved roads -->
 						<rule e="way" k="sac_scale" v="~|hiking|T1" >
@@ -1830,24 +1833,26 @@ Contact: Michael Scheer <theme@tapiola.org>
 							</rule>
 						</rule>
 						<!-- No pedestrians, restriction -->
-						<rule e="way" cat="barriers_access" k="foot" v="ft_no" zoom-min="14" >
-							<rule e="way" cat="access" k="*" v="*">
-								<line stroke="#ff0000" stroke-width="2.0" stroke-dasharray="0.3,1.3" stroke-linecap="butt" scale="all" />
+						<rule e="way" cat="c_highway" k="*" v="*" >
+							<rule e="way" cat="barriers_access" k="foot" v="ft_no" zoom-min="14" >
+								<rule e="way" cat="access" k="*" v="*">
+									<line stroke="#ff0000" stroke-width="2.0" stroke-dasharray="0.3,1.3" stroke-linecap="butt" scale="all" />
+								</rule>
+							</rule>
+							<rule e="way" k="*" v="*" zoom-min="15" zoom-max="16">
+								<pathText k="name" dy="2.2" priority="10" font-family="sans_serif" font-style="normal" font-size="12" fill="#000000" stroke="#FFFFFF" stroke-width="2.8" repeat-start="100" repeat-gap="550" />
+							</rule>
+							<rule e="way" k="*" v="*" zoom-min="17">
+								<pathText k="name" dy="1.4" priority="10" font-family="sans_serif" font-style="normal" font-size="13" fill="#000000" stroke="#FFFFFF" stroke-width="2.8" repeat-start="100" repeat-gap="550" />
 							</rule>
-						</rule>
-						<rule e="way" cat="road_captions" k="*" v="*" zoom-min="15" zoom-max="16">
-							<pathText k="name" dy="2.2" priority="10" font-family="sans_serif" font-style="normal" font-size="12" fill="#000000" stroke="#FFFFFF" stroke-width="2.8" repeat-start="100" repeat-gap="550" />
-						</rule>
-						<rule e="way" cat="road_captions" k="*" v="*" zoom-min="17">
-							<pathText k="name" dy="1.4" priority="10" font-family="sans_serif" font-style="normal" font-size="13" fill="#000000" stroke="#FFFFFF" stroke-width="2.8" repeat-start="100" repeat-gap="550" />
 						</rule>
 					</rule>
 				</rule>
-				<rule e="any" k="bridge" v="~|no|false">
-					<rule e="node" cat="c_highway" k="highway" v="turning_circle|passing_place|mini_roundabout" zoom-min="11">
+				<rule e="any" cat="c_highway" k="bridge" v="~|no|false">
+					<rule e="node" k="highway" v="turning_circle|passing_place|mini_roundabout" zoom-min="11">
 						<circle radius="1.2" scale-radius="true" fill="#575757" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="construction" zoom-min="11">
+					<rule e="way" k="highway" v="construction" zoom-min="11">
 						<line stroke="#575757" stroke-width="1.2" stroke-linecap="round" />
 					</rule>
 					<rule e="way" k="highway" v="service|road" zoom-min="13">
@@ -1869,37 +1874,37 @@ Contact: Michael Scheer <theme@tapiola.org>
 							<line stroke="#C3C3C3" stroke-width="1.2" stroke-linecap="round" />
 						</rule>
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="tertiary|tertiary_link|raceway" zoom-min="11" >
+					<rule e="way" k="highway" v="tertiary|tertiary_link|raceway" zoom-min="11" >
 						<line stroke="#202020" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="secondary|secondary_link" zoom-min="12">
+					<rule e="way" k="highway" v="secondary|secondary_link" zoom-min="12">
 						<line stroke="#101010" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="primary|primary_link" zoom-min="8" zoom-max="8" >
+					<rule e="way" k="highway" v="primary|primary_link" zoom-min="8" zoom-max="8" >
 						<line stroke="#000000" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="primary|primary_link" zoom-min="9" zoom-max="11" >
+					<rule e="way" k="highway" v="primary|primary_link" zoom-min="9" zoom-max="11" >
 						<line stroke="#000000" stroke-width="2.2" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="primary|primary_link" zoom-min="12" >
+					<rule e="way" k="highway" v="primary|primary_link" zoom-min="12" >
 						<line stroke="#000000" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="trunk_link" zoom-min="11">
+					<rule e="way" k="highway" v="trunk_link" zoom-min="11">
 						<line stroke="#000000" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="trunk" zoom-min="6" zoom-max="8">
+					<rule e="way" k="highway" v="trunk" zoom-min="6" zoom-max="8">
 						<line stroke="#000000" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="trunk" zoom-min="9">
+					<rule e="way" k="highway" v="trunk" zoom-min="9">
 						<line stroke="#000000" stroke-width="2.2" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="motorway_link" zoom-min="11">
+					<rule e="way" k="highway" v="motorway_link" zoom-min="11">
 						<line stroke="#000000" stroke-width="2.0" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="motorway" zoom-min="6" zoom-max="8" >
+					<rule e="way" k="highway" v="motorway" zoom-min="6" zoom-max="8" >
 						<line stroke="#000000" stroke-width="1.8" stroke-linecap="round" />
 					</rule>
-					<rule e="way" cat="c_highway" k="highway" v="motorway" zoom-min="9">
+					<rule e="way" k="highway" v="motorway" zoom-min="9">
 						<line stroke="#000000" stroke-width="2.4" stroke-linecap="round" />
 					</rule>
 				</rule>
@@ -1915,7 +1920,7 @@ Contact: Michael Scheer <theme@tapiola.org>
 						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="2.0" />
 					</rule>
 				</rule>
-				<rule e="way" k="highway" v="cycleway" zoom-min="14">
+				<rule e="way" cat="c_highway" k="highway" v="cycleway" zoom-min="14">
 					<line stroke="#7bcaff" stroke-width="0.6" stroke-linecap="butt" scale="stroke" />
 					<line stroke="#11635d" stroke-width="0.6" stroke-dasharray="0.8,0.8" stroke-linecap="butt" scale="all" />
 					<rule e="way" k="highway" v="cycleway" zoom-min="14">
@@ -1924,7 +1929,7 @@ Contact: Michael Scheer <theme@tapiola.org>
 						</rule>
 					</rule>
 				</rule>
-				<rule e="way" k="highway" v="track" zoom-min="12">
+				<rule e="way" cat="c_highway" k="highway" v="track" zoom-min="12">
 					<!-- Background -->
 					<rule e="way" k="tracktype" v="~|no|false|grade2|grade3|grade4|grade5" zoom-min="13">
 						<rule e="way" k="*" v="*" zoom-max="15">
@@ -1956,18 +1961,17 @@ Contact: Michael Scheer <theme@tapiola.org>
 						<rule e="way" k="tracktype" v="grade2" >
 							<line stroke="#8f4e1d" stroke-width="0.5" stroke-dasharray="1,9" stroke-linecap="butt" scale="all" />
 						</rule>
-						<!-- rule e="way" k="tracktype" v="~" >
-							<line stroke="#8f4e1d" stroke-width="0.5" stroke-dasharray="1.3,0.8,0.7,15" stroke-linecap="butt" scale="all" />
-						</rule -->
 					</rule>
 					<!-- Access restrictions -->
-					<rule e="way" cat="barriers_access" k="foot" v="ft_no">
-						<rule e="way" cat="access" k="*" v="*">
-							<line stroke="#ff0000" stroke-width="2" stroke-dasharray="0.3,1.3" stroke-linecap="butt" scale="all" />
+					<rule e="way" cat="c_highway" k="*" v="*" >
+						<rule e="way" cat="barriers_access" k="foot" v="ft_no">
+							<rule e="way" cat="access" k="*" v="*">
+								<line stroke="#ff0000" stroke-width="2" stroke-dasharray="0.3,1.3" stroke-linecap="butt" scale="all" />
+							</rule>
+						</rule>
+						<rule e="way" cat="road_captions" k="*" v="*" zoom-min="15">
+							<pathText k="name" font-family="sans_serif" font-style="normal" font-size="11" fill="#393935" stroke="#FFFFFF" stroke-width="3" />
 						</rule>
-					</rule>
-					<rule e="way" cat="road_captions" k="*" v="*" zoom-min="15">
-						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="11" fill="#393935" stroke="#FFFFFF" stroke-width="3" />
 					</rule>
 				</rule>
 				<!-- via ferrata OAM -->
@@ -2014,19 +2018,19 @@ Contact: Michael Scheer <theme@tapiola.org>
 						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="2.0" />
 					</rule>
 				</rule>
-				<rule e="way" k="highway" v="service|road" zoom-min="13">
+				<rule e="way" cat="c_highway" k="highway" v="service|road" zoom-min="13">
 					<line stroke="#ffffff" stroke-width="0.9" />
 					<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
 						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
 					</rule>
 				</rule>
-				<rule e="way" k="highway" v="living_street" zoom-min="13">
+				<rule e="way" cat="c_highway" k="highway" v="living_street" zoom-min="13">
 					<line stroke="#ffffff" stroke-width="0.9" />
 					<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
 						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
 					</rule>
 				</rule>
-				<rule e="way" k="highway" v="residential|unclassified" zoom-min="13">
+				<rule e="way" cat="c_highway" k="highway" v="residential|unclassified" zoom-min="13">
 					<line stroke="#ffffff" stroke-width="0.9" />
 					<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
 						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
@@ -2039,73 +2043,70 @@ Contact: Michael Scheer <theme@tapiola.org>
 					</rule>
 				</rule>
 				<!-- Mark cobblestone etc., OAM-->
-				<rule e="way" k="highway" v="*" zoom-min="16">
+				<rule e="way" cat="c_highway" k="highway" v="*" zoom-min="16">
 					<rule e="way" k="surface" v="rough_paved" >
 						<line stroke="#bbbbbb" stroke-width="0.7" stroke-dasharray="0,1.05" stroke-linecap="round" scale="all" />
 					</rule>
 				</rule>
-				<!-- rule e="way" k="highway" v="*" zoom-min="16">
-					<rule e="way" k="surface" v="smooth_paved|paving_stones" >
-						<line stroke="#bbbbbb" stroke-width="0.8" stroke-dasharray="0,1.2" stroke-linecap="butt" scale="all" />
-					</rule>
-				</rule -->
+				
 				<!-- Markers on access restricted ways -->
-				<rule e="way" cat="barriers_access" k="access" v="private|acc_no|no|permit" zoom-min="14">
-					<rule e="way" cat="access" k="*" v="*">
-						<!-- No markers if at least one is "yes" (foot or bicycle) -->
-						<rule e="way" k="foot" v="~|no">
-							<rule e="way" k="bicycle" v="~|no">
-								<line stroke="#ff0000" stroke-width="2" stroke-dasharray="0.3,1.5" stroke-linecap="butt" scale="all" />
-								<rule e="way" k="highway" v="turning_circle|mini_roundabout|pedestrian|service|road|living_street|residential|unclassified|construction">
-									<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
-										<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
+				<rule e="way" cat="c_highway" k="*" v="*" >
+					<rule e="way" cat="barriers_access" k="access" v="private|acc_no|no|permit" zoom-min="14">
+						<rule e="way" cat="access" k="*" v="*">
+							<!-- No markers if at least one is "yes" (foot or bicycle) -->
+							<rule e="way" k="foot" v="~|no">
+								<rule e="way" k="bicycle" v="~|no">
+									<line stroke="#ff0000" stroke-width="2" stroke-dasharray="0.3,1.5" stroke-linecap="butt" scale="all" />
+									<rule e="way" k="highway" v="turning_circle|mini_roundabout|pedestrian|service|road|living_street|residential|unclassified|construction">
+										<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
+											<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
+										</rule>
 									</rule>
-								</rule>
-								<rule e="way" k="highway" v="path|footway" zoom-min="14">
-									<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
-										<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
+									<rule e="way" k="highway" v="path|footway" zoom-min="14">
+										<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
+											<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
+										</rule>
 									</rule>
-								</rule>
-								<rule e="way" k="tracktype" v="grade1|grade2|grade3|grade4|grade5">
-									<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
-										<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
+									<rule e="way" k="tracktype" v="grade1|grade2|grade3|grade4|grade5">
+										<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
+											<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#393935" stroke="#FFFFFF" stroke-width="3.0" />
+										</rule>
 									</rule>
 								</rule>
 							</rule>
 						</rule>
 					</rule>
 				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="tertiary_link" zoom-min="11" zoom-max="12">
-					<line stroke="#ffffff" stroke-width="1.4" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="tertiary_link" zoom-min="13">
-					<line stroke="#fff248" stroke-width="1.4" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="secondary_link" zoom-min="11">
-					<line stroke="#f7c245" stroke-width="1.4" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="primary_link" zoom-min="11">
-					<line stroke="#f79616" stroke-width="1.4" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="trunk_link" zoom-min="11">
-					<line stroke="#26a965" stroke-width="1.4" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="motorway_link" zoom-min="11">
-					<line stroke="#0083d7" stroke-width="1.4" />
-				</rule>
-				<!--rule e="way" cat="c_highway" k="highway" v="tertiary|raceway" zoom-min="11"zoom-max="12">
-					<line stroke="#ffffff" stroke-width="1.4" />
-				</rule-->
-				<rule e="way" cat="c_highway" k="highway" v="tertiary|raceway" zoom-min="11" zoom-max="13" >
-					<line stroke="#fff248" stroke-width="1.4" />
-				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="tertiary|raceway" zoom-min="14">
-					<line stroke="#fff248" stroke-width="1.4" />
-					<rule e="way" cat="road_captions" k="*" v="*" zoom-min="14" zoom-max="15">
-						<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+				<rule e="way" cat="c_highway" k="highway" v="*" >
+					<rule e="way" k="highway" v="tertiary_link" zoom-min="11" zoom-max="12">
+						<line stroke="#ffffff" stroke-width="1.4" />
 					</rule>
-					<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
-						<pathText k="name" font-family="sans_serif" font-style="bold" font-size="11" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+					<rule e="way" k="highway" v="tertiary_link" zoom-min="13">
+						<line stroke="#fff248" stroke-width="1.4" />
+					</rule>
+					<rule e="way" k="highway" v="secondary_link" zoom-min="11">
+						<line stroke="#f7c245" stroke-width="1.4" />
+					</rule>
+					<rule e="way" k="highway" v="primary_link" zoom-min="11">
+						<line stroke="#f79616" stroke-width="1.4" />
+					</rule>
+					<rule e="way" k="highway" v="trunk_link" zoom-min="11">
+						<line stroke="#26a965" stroke-width="1.4" />
+					</rule>
+					<rule e="way" k="highway" v="motorway_link" zoom-min="11">
+						<line stroke="#0083d7" stroke-width="1.4" />
+					</rule>
+					<rule e="way" k="highway" v="tertiary|raceway" zoom-min="11" zoom-max="13" >
+						<line stroke="#fff248" stroke-width="1.4" />
+					</rule>
+					<rule e="way" k="highway" v="tertiary|raceway" zoom-min="14">
+						<line stroke="#fff248" stroke-width="1.4" />
+						<rule e="way" cat="road_captions" k="*" v="*" zoom-min="14" zoom-max="15">
+							<pathText k="name" font-family="sans_serif" font-style="normal" font-size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+						</rule>
+						<rule e="way" cat="road_captions" k="*" v="*" zoom-min="16">
+							<pathText k="name" font-family="sans_serif" font-style="bold" font-size="11" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+						</rule>
 					</rule>
 				</rule>
 				<rule e="way" cat="c_highway" k="highway" v="secondary" zoom-min="9">
@@ -2215,9 +2216,11 @@ Contact: Michael Scheer <theme@tapiola.org>
 				<rule e="way" k="toll" v="yes|tl_yes" zoom-min="12">
 					<line stroke="#88DD0000" stroke-width="1.0" stroke-dasharray="1,12" stroke-linecap="round" />
 				</rule>
-				<rule e="way" cat="barriers_access" k="access" v="permit" zoom-min="12">
-					<rule e="way" cat="access" k="*" v="*" >
-						<line stroke="#88DD0000" stroke-width="1.0" stroke-dasharray="1,12" stroke-linecap="round" />
+				<rule e="way" cat="c_highway" k="*" v="*" >
+					<rule e="way" cat="barriers_access" k="access" v="permit" zoom-min="12">
+						<rule e="way" cat="access" k="*" v="*" >
+							<line stroke="#88DD0000" stroke-width="1.0" stroke-dasharray="1,12" stroke-linecap="round" />
+						</rule>
 					</rule>
 				</rule>
 				<rule e="way" cat="c_highway" k="oneway" v="yes|1" zoom-min="16" zoom-max="17" >