diff --git a/Tapiola.xml b/Tapiola.xml
index 0d0608f..89f757b 100644
--- a/Tapiola.xml
+++ b/Tapiola.xml
@@ -130,8 +130,8 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 		</layer>
 		<layer id="L_publictransport" enabled="true" visible="false">
 			<name lang="ru" value="Ⓜ️ Общественный транспорт" />
-			<name lang="de" value="Ⓜ️ Öffentlicher Verkehr" />
-			<name lang="en" value="Ⓜ️ Public transport" />
+			<name lang="de" value="Ⓜ️ Strassen- und Nahverkehr" />
+			<name lang="en" value="Ⓜ️ Public transport, traffic" />
 			<cat id="pub_transp" />
 		</layer>
 		<layer id="L_restaurants" enabled="true" visible="false">
@@ -1852,7 +1852,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 						<!-- 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.5" stroke-linecap="butt" scale="all" />
+								<line stroke="#ff0000" stroke-width="2.0" stroke-dasharray="0.3,1.3" stroke-linecap="butt" scale="all" />
 							</rule>
 						</rule>
 						<rule e="way" cat="road_captions" k="*" v="*" zoom-min="15" zoom-max="16">
@@ -1902,7 +1902,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 					<!-- 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.5" stroke-linecap="butt" scale="all" />
+							<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">
@@ -1993,20 +1993,18 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 						<!-- 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">
-									<line stroke="#ff0000" stroke-width="1.7" stroke-dasharray="0.3,1.7" stroke-linecap="butt" scale="all" />
 									<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="path|footway" zoom-min="14">
-									<line stroke="#ff0000" stroke-width="1.5" stroke-dasharray="0.3,1.7" stroke-linecap="butt" scale="all" />
 									<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="tracktype" v="grade1|grade2|grade3|grade4|grade5">
-									<line stroke="#ff0000" stroke-width="2.2" stroke-dasharray="0.3,1.7" stroke-linecap="butt" scale="all" />
 									<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>
@@ -2131,17 +2129,17 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 						<pathText k="ref" repeat-start="40" repeat-gap="400" font-family="sans_serif" font-style="bold" font-size="12" fill="#FFFFFF" stroke="#005Db2" stroke-width="2.7" />
 					</rule>
 				</rule>
-				<!-- Access restriction markers -->
+				<!-- Access restriction markers on highways -->
 				<rule e="way" cat="barriers_access" k="*" v="*" zoom-min="14">
 					<rule e="way" cat="access" k="access" v="acc_no|no" >
 						<rule e="way" cat="c_highway" k="highway" v="*">
-							<line stroke="#ff0000" stroke-width="3.0" stroke-dasharray="0.3,1.7" stroke-linecap="butt" scale="all" />
+							<line stroke="#ff0000" stroke-width="2.7" stroke-dasharray="0.3,1.5" stroke-linecap="butt" scale="all" />
 						</rule>
 					</rule>
 					<!-- Access restriction markers on constructions -->
 					<rule e="way" cat="access" k="highway" v="construction" >
 						<rule e="way" cat="c_highway" k="highway" v="*" >
-							<line stroke="#ff0000" stroke-width="2.4" stroke-dasharray="0.3,1.7" stroke-linecap="butt" scale="all" />
+							<line stroke="#ff0000" stroke-width="2.4" stroke-dasharray="0.3,1.5" stroke-linecap="butt" scale="all" />
 						</rule>
 					</rule>
 				</rule>
@@ -3092,7 +3090,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 		<symbol src="file:symbols/cross.svg" symbol-percent="70" />
 	</rule>
 	
-	<rule e="node" cat="misc" k="man_made" v="cairn" zoom-min="14" cat="landscapefeat">
+	<rule e="node" k="man_made" v="cairn" zoom-min="14" cat="landscapefeat">
 		<rule e="any" k="mountain_pass" v="~">
 			<rule e="node" k="*" v="*" zoom-min="13" zoom-max="15">
 				<symbol src="file:symbols/s_cairn.svg" symbol-percent="100" />
@@ -3102,7 +3100,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			</rule>
 		</rule>
 	</rule>
-	
+
 	<rule cat="water" e="any" k="man_made" v="water_well" zoom-min="15">
 		<rule e="any" k="drinking_water" v="yes">
 			<symbol id="id_drinking_water_yes" src="file:symbols/water_well_drinking.svg" symbol-percent="60" />
@@ -3819,6 +3817,15 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<caption symbol-id="id_bus_stop" k="name" dy="-4" font-style="bold" font-family="sans_serif" font-size="11" fill="#333333" stroke="#ffffff" stroke-width="1.5" text-wrap-width="120" />
 		</rule>
 	</rule>
+	
+	<rule e="node" cat="pub_transp" k="highway" v="traffic_signals" zoom-min="15" >
+		<rule cat="c_highway" e="any" k="*" v="*">
+			<rule e="any" k="*" v="*" >
+				<symbol src="file:symbols/s_traffic_signal.svg" symbol-percent="120" display="always" />
+			</rule>
+		</rule>
+	</rule>
+	
 
 	<rule cat="playground" e="any" k="leisure" v="playground" zoom-min="16">
 		<symbol id="id_playground" src="file:symbols/playground.svg" symbol-percent="100" />