From 0a4aeec846a9ba6071da46f43ad20850975d0445 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 28 Jan 2022 22:28:45 +0300
Subject: [PATCH] [styles] Regenerate for highways and tourism=attraction

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/colors.txt                     |   2 -
 data/drules_proto.bin               | Bin 207846 -> 209147 bytes
 data/drules_proto.txt               | 680 ++++++++++++++++++++-----
 data/drules_proto_clear.bin         | Bin 208681 -> 210088 bytes
 data/drules_proto_clear.txt         | 710 +++++++++++++++++++++++----
 data/drules_proto_dark.bin          | Bin 207221 -> 208753 bytes
 data/drules_proto_dark.txt          | 735 ++++++++++++++++++++++++----
 data/drules_proto_vehicle_clear.bin | Bin 137447 -> 137443 bytes
 data/drules_proto_vehicle_clear.txt |  80 +--
 data/drules_proto_vehicle_dark.bin  | Bin 136813 -> 136809 bytes
 data/drules_proto_vehicle_dark.txt  |  80 +--
 data/visibility.txt                 |  16 +-
 12 files changed, 1890 insertions(+), 413 deletions(-)

diff --git a/data/colors.txt b/data/colors.txt
index 6ec8888ec1..0e08f06446 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -382,11 +382,9 @@
 4043309055
 4279308544
 4281545523
-4281742388
 4287137928
 4287393810
 4288578070
 4294761984
-4294769916
 4294960384
 4294967295
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 4112cac334fdba9db87b85379a7fb056ddb5021b..1b8b7f34b7ab562d0cb4ab27c956c050dd810544 100644
GIT binary patch
delta 2342
zcmdT`ZAep581_AP+r7JUy4|V!DC$~KQmzk#T4}fyp(XYK^&|ZeD`#Du8_tc2$fgiQ
ze@aetsvi+VWnWNT+M>t|A_V^w1QJ9PiNi7~vQ~txd#C#-vj_&|`E~Alo_pTs{XPSI
z*<W8|U#;z=OXBN8czq@40Q)Yi_({@xF)1Murat_z8rFi?bGb>g;ERII-yv+@vD3NR
z+T`_nebQ!&Tkte;%Ndr-SD!o~ufcNNx#1C-7s&=27>jy?utLkIb+K5C=B1CKO%hro
zp|j%a-5=035;|K#kMT~R@x3cXa%vUml{H)`qb0R=un_fP(8@vsSH|RUhA|CUc9{=u
z?kWx+v%_3KM``T1H9h}7<6O`%j<e)L4QbwsEI9Ux0fSh0dnH04nY{_O-k~#QLHW2C
z)o>f*ULTF9+O7+>wJR)H{B?~DejkiFMvIqrtxU$kOpnG{hxK=PHWd@GsViKhc&uRa
zuzn~Hmqjd+IjOYxT(0Zx{6_Pq@P_BcoKSiWg|MUF4Dvx9_718vsq6~jV80pPh!|vf
zZkk-mx?SSwNF$)PDx5oHBz+Fh<BCXbhIQ(H(#bVo$1{U?X0QRFN3!N68CLj%@pt;I
zn14fy-9s~}MFSLTNYtv&)gsinJbuCH=8Ar-rqAzR()>quA=ttXOmGv>YYKmRKgIkf
zSepv3j~4J-eL~%K*Tk3NP;{;MaJUsg2VNJQHu1G$C~Bt?tw?S>ZMgMoPr9I<bXUPb
zeB_CW1ka)z;?4z5RFABJbddblVbK-aXfOVxV7Y_?{Jwyvaq@Mlk`9_RkGH`(=Jm<h
zz)Hkl8|4ppJT7;}CdohQX>$;a5M3o$OmZ(v4#aqwy^zZch@%>&7SCg}(tt`1wXt&>
zEaO-$!|LuI>_8@IV)lXQ%f9fn)u04hJC#a?fM=WA+0r7^3$8k=)8}$>=6LhWq(XFD
zNp7wI9+wVtsx<EN|Asra85dqMo}W<#2z4sRtZLvh=oun;ruKmJLXlo6Xi>P}5MnvM
zH{cUmnygO0-{;)s7rY))p`xN_KOzT})KpTbqV`ZT89jNfr1Hp#&7eU8d%{nZ6g&Gn
D0;T`t

delta 1418
zcmezUkmuQTo(<6}*crg!!{*&91sEq6t#m>X2x5eBChuOEwz+EcZXW-37B10@%=C=%
z#7f=V{F3}4AR|5}GcQ|6oP*0sn2VQ#OJLEF4n~RF*SF7SmN?zO2$bN)CBZX&f(N50
zpO7^NuaGcj8W?<=JZHB7vkeE|Wd5B}lV9#v+}yrXi!p2w8<z}Li*=KVGE>r1scOI3
zWTBlx(<S{G^|$xAGMX|mt!10+wNHL>)jKY2(tVc#^qo4VF&J=9Z{%c@o_^PZk(~$X
zUweT^Cq7MHxLcb!73gV){mz?T?q8w7^n`ix<QE3az|foA|6bGx=szB4Fm8T!1{}WE
z86~!X!<QGU#OB(U*^Es8Stq}GWezjOgmhzsvL@HR6yN;ibs7`XL)OVL@8E`!;ik!Y
z&on3Beb2tR_PsK*_%s$SVOX3Nr50zVq~?`mCgx0^=*=j)y-$kqEhE!xmdV{;q^FDf
zGKxS%7&lI?_$Ie~x(uTzGvmR@H9zI1TLv<UOb06ezq$5T852^PZJhd#QDFLiUq)#l
zBV{tzKT9OZw9Om-%|=e)2-REvG462iX<^|Kg1N4ws5CE|9_gHEKHGFd7e*OVYGx;l
z<h%-OiRk3wcY^du&k{_G=cZSAGfGXq@<$#P3E(n^=`z#w-#(0Tm=Z5prZ@O8Domcb
zQeFsJO4$qi`1qJz;USj=<2HXrNhYSB%pf)5Q<WJtV5UOLDnG_{mte;2F2PKXw@NiJ
zatW2>mlkCf=jtYwloTZ<mt^MW35js<PhQw8%q+qo0Hp<?v=EdQo-Eib95#=UOA=GN
sZem_$Zeos*AP2t^FBfZ7e!gz5#JOfh1qq;#0H%;2n$Y%-T+Cc*0CdO8-~a#s

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 42eb532b01..214d73ef4c 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -14210,7 +14210,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14330,7 +14330,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14450,7 +14450,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -15630,6 +15630,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15638,9 +15645,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15649,9 +15669,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15660,11 +15693,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15687,7 +15726,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15823,6 +15862,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15831,9 +15877,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15842,9 +15901,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15853,11 +15925,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15880,13 +15958,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -15894,7 +15972,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -16112,6 +16190,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16120,9 +16205,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16131,9 +16229,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -16142,11 +16261,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16156,7 +16281,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -16179,7 +16304,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16189,7 +16314,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -19476,6 +19601,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19484,9 +19616,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19495,9 +19640,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19506,6 +19663,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19657,6 +19820,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19665,9 +19835,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19676,9 +19859,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19687,6 +19882,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19934,6 +20135,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19942,9 +20150,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19953,9 +20174,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19964,6 +20197,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -20247,16 +20486,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20266,14 +20495,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20441,16 +20662,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20460,14 +20671,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20635,16 +20838,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20654,14 +20847,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20925,16 +21110,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20944,14 +21119,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -21239,7 +21406,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21359,7 +21526,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21543,7 +21710,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -27089,6 +27256,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27097,9 +27271,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27108,9 +27295,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27119,11 +27319,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27146,7 +27352,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27282,6 +27488,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27290,9 +27503,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27301,9 +27527,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27312,11 +27551,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27339,13 +27584,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -27353,7 +27598,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -27571,6 +27816,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27579,9 +27831,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27590,9 +27855,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27601,11 +27887,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27615,7 +27907,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27638,7 +27930,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27648,7 +27940,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27832,6 +28124,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27845,11 +28147,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27952,6 +28262,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27965,11 +28285,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28072,6 +28400,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28085,11 +28423,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28288,6 +28634,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28301,11 +28657,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -64957,43 +65321,80 @@ cont {
 cont {
   name: "tourism-attraction"
   element {
-    scale: 15
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
     }
   }
   element {
     scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -65001,11 +65402,16 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -65013,26 +65419,61 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
 }
 cont {
   name: "tourism-attraction-animal"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "zoo-m"
+      name: "tourism-m"
       priority: 16846
-      min_distance: 24
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
     }
   }
   element {
     scale: 16
     symbol {
-      name: "zoo-m"
+      name: "tourism-m"
       priority: 16846
-      min_distance: 24
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
     }
   }
   element {
@@ -65042,6 +65483,15 @@ cont {
       priority: 16846
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
   }
   element {
     scale: 18
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index be6fde67a3f2ab213ec45853f3d0a61dcdf3a9fd..90fc4b7b55bc8320e06d4fd2b19265246ab71b35 100644
GIT binary patch
delta 2151
zcmds2TS${(820`4>$ZPxZvUKaCbbSQD_0Altf<Wnlt^B5AY2!*^7J>|N+)&zPZ32o
zwcg^Zpo0)))`j+$zg}23-G~qfL0v>Cg((RpiX|oXP3I}219~C7ci;0pJl}iz-uM37
z=$h{6I{BV5Wz_nyez+2yHElngFQBb<%M>hEuFHT-kd{3x)Nn%_Z^BzmrZ{1fiWf}k
z>(@fo?bP2L7*<*(x@IlJC$(0<7OhIH9~l`@TG=6KA7g76J7Uy6|AFmh>}bXgyE(x=
z%CyniXoz$R8&z7maWf>)?iA26%%U2Tj&Mn7jcy>9m3X6Rk!fD}XpB3e(h0_J5+YpT
zlxe6_CMMdV1}zxnau;kRq#@+KIWbV;^W_xGS*D#c>f#pmj%IqSifWg>qOyuhh_F7=
zq{43s5aSlIRa(KO&K)%!wmr4tvu4Y9HH_LE7O5>9sXlbgPsS~^G|NfkC5Kg=4(xan
z3pdgCE*@Py96!-C4S3_dg}bS70Jb&9>KdjtR0A5?Eok^?G`#}z^c&V{$EEL`ULd_u
zD0Z!zmAqkwJZ83Aq>-*8gtSGW_tTuqTRzw&Q_l(o=~Q4^ZyY3Hu+Jh@_sT#%DbU@w
zU<v}2SlYjE48ZE%T~hKu8G#@^7@P!K<fn;n3D7t6Vf;T!^}~8V@!R@wfDM6MdOIB)
zlJmP4#!*J=awZRQypS*E<(GO+*aJl+KJUQ-(dV7Bew;ZcX8-e3f=b>p(`WmkA~8EJ
zXMVZ<_X8nC`gK(Q?SQZm7^a`MLxMT9HYS$L*S_~kYX|RuRG^D9ATfC*8$-s)MG?MF
zg$)9mCA|LmxgasKEyRBEP`Mo30g+&?QcN~TiSKZMr?^<m6?3xD-<J?IJ8g0`l3v{j
zR;2yHRH;?};--*=o-ancSj*wIfz`B32O7LxtCqK?Lo<*Xj&d37h1S7oFZ@#?C`-hF
zvuvre#ZF#7jyq3yA>c155{nD%o<N|;b2uRSeN>x8_D~rVcgPuXrB#tgby;M02v{Do
fRApGA<s(n}{q{ohi_`SjelU{GQ%{Bzj#WPZYjV?d

delta 1243
zcmZ4Sl4s>To(<cVPv7&8k#lm<s+8&aUW}_IpIhOCCZfIyBC@$?l{_y?I}4ZSWWimc
zEJETOT$Atb1v9u|44%miJ4A(rtT}jvggMi|;G4a`vM+z9UvOj8X13wroBVE<)Z~}<
zcqcdP7TNyPfl-T*X%X9G{$29Sq?;#}#lZ)(=j<5}_ye|wU12l#<os{;ll}LLZ=SMS
zfQe}>$aIOx`}VTqwt-J51?XaRPGd0Oo}9QvdUD@>c6O)_CZFGDHhKO&2bjAzr|oao
zV0ywl`TcVPA8`(DD`75P4laSs&(1JP+`hhjKC{HO21a1`@SsUtXM{@dVwbR)eDI<0
z=65f`7+L<aa!F7A_*`Ui%qvAN>RB;)|3lHuKCiQwSRTSGIQN#S7IZz;oV?&Y>*nk4
zRGFEku}uE=QEYmVC!@&rJPF3PjN-FdxFj+%(=*BwD|L%fi!)PF^GY%kbEbdvVw8d^
z*~rEvg+<Bsd?`j*X2ye)Z~Ty(F6qxGG975*|Lwcw7$-4K&i?%bCDlq#)o1LVoc7le
zF1nfL-)u%W50uuWx9T&d+e@{ua0$VzD=8|?%Z|^<%*&=;>YmRwUC@b926y7anO%rV
z-mAdIi*l8e=H;d4;C43YN&Gt_<GJZko{Un{MZ6g$r*Hem$PX_jm@YF-zwN~+hfV4w
z%k%^vMg@cv=Z}w%*%cmgSuk#Y;KL}%#PpLHq(XeM<0=hsi~viPO^od-fsET#0-3rt
zGdfJ)z``ubEW#l)d10_HkQSb-*euLgF?}y9vy7M^hoBNK7i(31zHY9>xn@QM2_a<;
Rq3H|Rm=(9rWn<>n0{|P@x*Y%j

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index bdb58eef4e..6d5d56d432 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -14144,7 +14144,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14264,7 +14264,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14384,7 +14384,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -15564,6 +15564,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15572,9 +15579,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15583,9 +15603,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15594,11 +15627,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15621,7 +15660,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15757,6 +15796,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15765,9 +15811,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15776,9 +15835,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15787,11 +15859,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15814,13 +15892,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -15828,7 +15906,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -16046,6 +16124,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16054,9 +16139,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16065,9 +16163,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -16076,11 +16195,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16090,7 +16215,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -16113,7 +16238,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16123,7 +16248,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -19410,6 +19535,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19418,9 +19550,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19429,9 +19574,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19440,6 +19597,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19591,6 +19754,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19599,9 +19769,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19610,9 +19793,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19621,6 +19816,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19868,6 +20069,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19876,9 +20084,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19887,9 +20108,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19898,6 +20131,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -20181,16 +20420,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20200,14 +20429,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20375,16 +20596,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20394,14 +20605,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20569,16 +20772,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20588,14 +20781,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20859,16 +21044,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20878,14 +21053,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -21173,7 +21340,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21293,7 +21460,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21477,7 +21644,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -26895,6 +27062,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26903,9 +27077,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26914,9 +27101,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -26925,11 +27125,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -26952,7 +27158,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27088,6 +27294,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27096,9 +27309,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27107,9 +27333,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27118,11 +27357,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27145,13 +27390,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -27159,7 +27404,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -27377,6 +27622,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27385,9 +27637,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27396,9 +27661,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27407,11 +27693,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27421,7 +27713,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27444,7 +27736,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27454,7 +27746,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27638,6 +27930,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27651,11 +27953,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27758,6 +28068,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27771,11 +28091,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27878,6 +28206,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27891,11 +28229,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28094,6 +28440,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28107,11 +28463,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -64586,8 +64950,81 @@ cont {
 }
 cont {
   name: "tourism-attraction"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 18
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64595,11 +65032,16 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64607,12 +65049,63 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
 }
 cont {
   name: "tourism-attraction-animal"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -64620,6 +65113,15 @@ cont {
       priority: 16846
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
   }
   element {
     scale: 18
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 18ee3ba796231200af9d913dd4ec4a56ea297908..863d86e827990e6616d062b19f0041b6e44d5060 100644
GIT binary patch
delta 1940
zcmd5-Ye-XJ820_P<Jpe7=GmM_(K(7hsf8ht7331K#4cDukVUMtJg8gEiDg2AFewaL
zFZiL97z!gIDo;5pFA(%6yJ!&f$4WBAkeD~fH0*3@DHUW2_5C{My*xbMbKd8?V=qI8
z-h|#R@nDrtBb9s7VdjAae1ARF|AOV7LtfJ^NCxT2jaMPW!{9Zq5Rt0l_y~1Pwf_vH
zXx(k^z$D=_DN@tnf>d6m78*Z1VN4x3^wyyE%`Gs`FK|Kp{zQK*pQ;L#A(H}UWVVC4
z)<Gn$X%6RRsw}E7T4sT0yx+Q#Zek%+8D!DAX-XO-d0Q-y0^|{knpPp^utUr_mMf$F
z2Sg2am4?@;gQkznHy~FC&1@tQxcfCrI~5QNI_cJfgM_sB`Nu6n;gsJgoFyx)o%v{L
zOLUN_F(euOK=T|`81}SomL*@sPG3QbC+-^XMH|EYxRs=B(<i_buIyine77EIF|${H
z`6J7HpN1yf(QORGBQ;HP$D|1_bsO<szb?8Hg!vhHK28SaL#peq08+zZ!od2!#t;7q
zA0NImO6>#Z2ze8X+Xj~uy1Cbkai17zXfR$8RjK53dE&9W66-0mBezJ*$+bB}YXNUY
z_iz;LiiPg_D<hzED>(t{M)i1nn1T5@@Zi-^<B#Az>A+YGA@vN_jv7$&nVn8~WvoJi
zPrvle__q`*r!L~-$qlo9mh!(=2b?aOyHu*2O1G?TU^sr3ozqcl%Rf{g+VcMo_x#%C
z?JWJe1!5NAlO_BUEy&>aS-N@aqL}|XhsP6Pf^hoTQ7N_^DX<n5iATlU98B~@1ov=>
z@~WU+=@0{}(CyO+JzO$u<hd{vr|o-Mtq@!;mu$lEGu}JfK>@_2piSvu#FAlt;muVH
z<ubs8NxlU&XJ<epA(xfZxf4wEd@L-ao65YiE98wRZ$*-K({O=sywhIn5Q_@UR;SZp
zJ>nGYHo7&7?4{mG(m=`y?U*1jG%btl@kbJttx$z85963pyWLzUJU>grTZoSIo%W7T
HkTUZ(xW~a(

delta 1208
zcmcgsUr1A76z6>RYIk>=xqCP7w54-F1hI#T@Xs>;MG!=55%kbQT-wTubCY?+^2KFP
zy#&d5_zIsia7YEoeYg<i5__qvtcb`5oh+zWBoZcsVt2C@JtTzHc{<-YzmMPdJN&*g
zKW$lfVY%Ivpy4GjY4OA%$Y&P7^l($|gz-dBA3p-spgp?r%1nk>9MGM+C62EZc`L^k
zU+NoVo$<j3R~hHyI0zDF{$0aDQ%&Ho2@RZ85KX6Y@uj}F4;zy^X}23T($Z!q(v@Zi
z0U0aA;!!6a&Dgg89fp!9S7gvWnaIYHK|7iPw`Qg_o1tF!?}tW0hO?X%>(Evt1PyH-
z)2>{Yape9c(+{P%H|aw$>7$0gt=d#_W*fxu&ifri;%KD=BDQB(M&c|uGUs58Ia;#`
zw$C`UhaX}<`U|lxQ?({otNYkb$V`C&lyLr&du{O4T!4}8vb@-$oNnoo&w68_4kZ|h
zsEQn>=UgzTr^?_0z!>@#T(s8(1K$g;(Z5)(8wDRjUKZft#S*;ob%Xw<0(64q%Ww0(
z>7mmAmr+`&$yb8fy_IXLE;D@9qZ|DL4F|8YypVr`8taU-o(L<ER$~JH*kYrFbaEfK
z@OXy*e;ymkkvjIMosmc=ybh6n<h9ShP7vNs1Aee$YT5JiqqENmUz)8uSUDDwe{GU?
zEcN@rjp^lz+!a$|@+P=v`D)Og`9UHi&13-*T?v4RRspQSvP<Klu{4auL0WE=Ht>QP
z?TjfMZC+VbWAaH=iADrFC!ky{GImbH*<KOO&{|+zB{t6HvGN7o(Wtl0`Sd)vox&DQ
Opyh<A)XNBS%=-<e?v6bG

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 88bc55402b..9dc6fbd3ac 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -14144,7 +14144,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -14264,7 +14264,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -14384,7 +14384,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -15582,6 +15582,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15590,9 +15597,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15601,9 +15622,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15612,11 +15647,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -15640,7 +15682,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -15782,6 +15824,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15790,9 +15839,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15801,9 +15864,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15812,11 +15889,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -15840,13 +15924,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 2236945
       dashdot {
       }
@@ -15854,7 +15938,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 4473924
       dashdot {
       }
@@ -16078,6 +16162,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16086,9 +16177,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16097,9 +16202,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -16108,11 +16234,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -16121,7 +16254,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -16145,7 +16278,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -16154,7 +16287,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -19462,6 +19595,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19470,9 +19610,23 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19481,9 +19635,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 4334872
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19492,6 +19659,13 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -19649,6 +19823,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19657,9 +19838,23 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19668,9 +19863,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 4334872
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19679,6 +19887,13 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -19932,6 +20147,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19940,9 +20162,23 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19951,9 +20187,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 4334872
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19962,6 +20211,13 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -20245,16 +20501,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20264,14 +20510,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -20447,16 +20685,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20466,14 +20694,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -20649,16 +20869,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20668,14 +20878,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -20947,16 +21149,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20966,14 +21158,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -21265,7 +21449,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -21385,7 +21569,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -21569,7 +21753,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -27041,6 +27225,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27049,9 +27240,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27060,9 +27265,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27071,11 +27290,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -27099,7 +27325,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -27241,6 +27467,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27249,9 +27482,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27260,9 +27507,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27271,11 +27532,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -27299,13 +27567,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 2236945
       dashdot {
       }
@@ -27313,7 +27581,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 4473924
       dashdot {
       }
@@ -27537,6 +27805,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27545,9 +27820,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27556,9 +27845,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27567,11 +27877,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -27580,7 +27897,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -27604,7 +27921,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -27613,7 +27930,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -27798,6 +28115,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27811,11 +28138,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27918,6 +28253,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27931,11 +28276,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28038,6 +28391,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28051,11 +28414,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28254,6 +28625,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28267,11 +28648,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -64673,8 +65062,81 @@ cont {
 }
 cont {
   name: "tourism-attraction"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 18
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64682,11 +65144,16 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64694,12 +65161,63 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
 }
 cont {
   name: "tourism-attraction-animal"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -64707,6 +65225,15 @@ cont {
       priority: 16846
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
   }
   element {
     scale: 18
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index bdd735fee9b154b07d87eacb3d901e60e78ad396..bc3c2cd8d4384879f2e54294bc591748d40745f1 100644
GIT binary patch
delta 195
zcmaF9k>l}3jt%^UOz&7G3l@rP7OLWB-29}(i;?Lw%j9{*(g*>@uF3jka+8IsYBoPD
z`^3bwmvyp1nb_p_mFz$@#f~iRnYctIKiDI}A|%PdJz3CEVsb(K>d8?KlNrBEzPm@B
z5k-upi<L_ns9KaOsVFlgJrzlh$>yGYa!f3<SfC0@O7rqkbC48F*!<Tih_QLiq3vr9
IF<OTK0Pu`RG5`Po

delta 315
zcmaF7k>mMBjt%^UOkJ##1q;Qbr8u~S#5j$?;Ih5IpP!%q^DFdo8!%chZeCa^z_@u$
zi5H_qKP#6+MrL|Od19q*QEG8!N@`w7W@3(RVo_?M5K%@jE}Q(lR1TkYlNVOjZk|~7
ziOK3FE0+{D+e%9F@=|jM*jM5xafOLX1g5_<FF7Z%xHvN{Gc{%N{yp}LEH|0BBq#SD
z5S_eW5Bugrdu$k)-m^^Fr!aX<t<mP(eR51p|CuN46QBIEZu;iGPC<;#D-La6afs16
F3;?%ma}fXl

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 2c71ce1aa0..3a48be95d5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -9725,16 +9725,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -9959,16 +9949,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10193,16 +10173,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10523,16 +10493,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -16282,6 +16242,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16402,6 +16372,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16522,6 +16502,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16738,6 +16728,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index d25e7697a1fd8e1cbb806abdd1034084b3a4196d..0551350d50c21de88fe711df3400f4c75be77fd5 100644
GIT binary patch
delta 178
zcmaF6hU4WLjt#-Z;@erdgflYJGs+Vyb&FDqGgDIYN-`63HYb)XW@6kkS*uKDb5hwN
zCZ^NulRwmmu_YB{rlhA%PAr?a`Fy23Gt)O#ps*}Zi5cVO_&P>s#<!Cb4@xm|PrmOc
zv02I9hLQ2p<ZXxKkp=!t7C52^5tyuGZ?ZZ0hyW8~3s6vEa?deNxWt6bIZif=&G9F;
K$Dd&2^8)~m<wQ;Z

delta 251
zcmaF4hU4uTjt#-ZESFiigeMD@3Cjpcac~QXaT<fcWqW}wFK+zgSLo+9V6<S|oK?J-
ziSfo{zA_nULdsa4vvWxSO%zc|D#}brPsMBQtBMWGER)!v8cIs@@=|l~YRD=!XWab0
zmeHB<(&Uc^q&BPATQM?TpPYC|9>RP$`PyN{$-f$mHoF`VU}Ad7JUQ%`!ekZuzGnI3
L+vSfldietYed|*W

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 592b20ab5b..41aeb5f63a 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -9892,16 +9892,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10142,16 +10132,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10392,16 +10372,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10738,16 +10708,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -16676,6 +16636,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16796,6 +16766,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16916,6 +16896,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -17132,6 +17122,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
diff --git a/data/visibility.txt b/data/visibility.txt
index b9324732b8..aadda5dfc8 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -371,10 +371,10 @@ world  00000000000000000000  +
             tunnel  00000000001111111111  -
             {}
         raceway  00000000000000000000  -
-        residential  00000000000111111111  +
-            area  00000000000111111111  -
-            bridge  00000000000111111111  -
-            tunnel  00000000000111111111  -
+        residential  00000000000011111111  +
+            area  00000000000011111111  -
+            bridge  00000000000011111111  -
+            tunnel  00000000000011111111  -
             {}
         rest_area  00000000000000000000  -
         road  00000000000011111111  +
@@ -431,10 +431,10 @@ world  00000000000000000000  +
             bridge  00000000001111111111  -
             tunnel  00000000001111111111  -
             {}
-        unclassified  00000000000011111111  +
-            area  00000000000011111111  -
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        unclassified  00000000000111111111  +
+            area  00000000000111111111  -
+            bridge  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
         world_level  00001111110000000000  -
         world_towns_level  00000011110000000000  -