From cd2c9cc224d9ac79c6896e25a0aa4a6fc1e3949f Mon Sep 17 00:00:00 2001
From: Darafei Praliaskouski <komzpa@gmail.com>
Date: Sun, 15 Sep 2013 19:16:09 +0300
Subject: [PATCH] [styles] circles, darker footways

---
 data/drules_proto-bw.bin |  Bin 207678 -> 207652 bytes
 data/drules_proto-bw.txt | 1605 +++++++++++++++++++-------------------
 data/drules_proto.bin    |  Bin 183176 -> 183255 bytes
 data/drules_proto.txt    |   87 ++-
 data/ink.mapcss          |   44 +-
 data/normal.mapcss       |   21 +-
 6 files changed, 910 insertions(+), 847 deletions(-)

diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin
index 36c9a0368aa2e1bc38e472096ff1190ecfe8bcc5..4c9d44b2ffb093c147d982e8609b6b926cfd42ec 100644
GIT binary patch
delta 6903
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
C2>!bO

delta 7083
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
O=fBO>a-D8{hyMWet~f&g

diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index d6b820c677..7ba163b26d 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -233,7 +233,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -258,7 +258,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -283,7 +283,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -308,7 +308,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -333,7 +333,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -358,7 +358,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -383,7 +383,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -408,7 +408,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -436,7 +436,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -457,7 +457,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -478,7 +478,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -499,7 +499,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -520,7 +520,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -541,7 +541,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -562,7 +562,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -583,7 +583,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -709,7 +709,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -721,7 +721,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -733,7 +733,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -745,7 +745,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -757,7 +757,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1148,7 +1148,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1169,7 +1169,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1190,7 +1190,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1214,7 +1214,7 @@ cont {
       priority: 16017
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15017
     }
@@ -1226,7 +1226,7 @@ cont {
       priority: 16017
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15017
     }
@@ -1247,7 +1247,7 @@ cont {
       priority: 16017
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15017
     }
@@ -1268,7 +1268,7 @@ cont {
       priority: 16017
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15017
     }
@@ -1292,7 +1292,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1304,7 +1304,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1325,7 +1325,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1346,7 +1346,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1428,7 +1428,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1440,7 +1440,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1461,7 +1461,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1482,7 +1482,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1506,7 +1506,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1518,7 +1518,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1539,7 +1539,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1560,7 +1560,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1584,7 +1584,7 @@ cont {
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
@@ -1596,7 +1596,7 @@ cont {
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
@@ -1617,7 +1617,7 @@ cont {
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
@@ -1638,7 +1638,7 @@ cont {
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
@@ -1662,7 +1662,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1674,7 +1674,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1695,7 +1695,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1716,7 +1716,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1740,7 +1740,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1752,7 +1752,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1773,7 +1773,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1794,7 +1794,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1818,7 +1818,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1830,7 +1830,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1851,7 +1851,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1872,7 +1872,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1896,7 +1896,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -1908,7 +1908,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1929,7 +1929,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1950,7 +1950,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -1988,7 +1988,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2013,7 +2013,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2038,7 +2038,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2066,7 +2066,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2078,7 +2078,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2099,7 +2099,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2120,7 +2120,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2144,7 +2144,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2165,7 +2165,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2186,7 +2186,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2210,7 +2210,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2222,7 +2222,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2243,7 +2243,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2264,7 +2264,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2288,7 +2288,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2300,7 +2300,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2321,7 +2321,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2342,7 +2342,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2366,7 +2366,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2378,7 +2378,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2399,7 +2399,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2420,7 +2420,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2444,7 +2444,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2456,7 +2456,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2477,7 +2477,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2498,7 +2498,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2522,7 +2522,7 @@ cont {
       priority: 16102
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15102
     }
@@ -2538,7 +2538,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2563,7 +2563,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2588,7 +2588,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2616,7 +2616,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2628,7 +2628,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2640,7 +2640,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2661,7 +2661,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2682,7 +2682,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2864,7 +2864,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2885,7 +2885,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2906,7 +2906,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2930,7 +2930,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -2942,7 +2942,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2963,7 +2963,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -2984,7 +2984,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3022,7 +3022,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3047,7 +3047,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3072,7 +3072,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3100,7 +3100,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -3112,7 +3112,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3133,7 +3133,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3154,7 +3154,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3178,7 +3178,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -3190,7 +3190,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3211,7 +3211,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3232,7 +3232,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3256,7 +3256,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -3268,7 +3268,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3289,7 +3289,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3310,7 +3310,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3763,7 +3763,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -3775,7 +3775,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3796,7 +3796,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3817,7 +3817,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3841,7 +3841,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -3853,7 +3853,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3874,7 +3874,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3895,7 +3895,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3919,7 +3919,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3940,7 +3940,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3961,7 +3961,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -3985,7 +3985,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4006,7 +4006,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4027,7 +4027,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4051,7 +4051,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4063,7 +4063,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4084,7 +4084,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4105,7 +4105,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4129,7 +4129,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4141,7 +4141,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4162,7 +4162,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4183,7 +4183,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4207,7 +4207,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4228,7 +4228,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4249,7 +4249,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4273,7 +4273,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4285,7 +4285,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4306,7 +4306,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4327,7 +4327,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4351,7 +4351,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4363,7 +4363,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4384,7 +4384,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4405,7 +4405,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4429,7 +4429,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4441,7 +4441,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4462,7 +4462,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4483,7 +4483,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4507,7 +4507,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4519,7 +4519,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4540,7 +4540,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4561,7 +4561,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4599,7 +4599,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4624,7 +4624,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4649,7 +4649,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4677,7 +4677,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4689,7 +4689,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4701,7 +4701,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4713,7 +4713,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4734,7 +4734,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4755,7 +4755,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4779,7 +4779,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4791,7 +4791,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4812,7 +4812,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4833,7 +4833,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4857,7 +4857,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4869,7 +4869,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4890,7 +4890,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4911,7 +4911,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4935,7 +4935,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -4947,7 +4947,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4968,7 +4968,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -4989,7 +4989,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5013,7 +5013,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -5025,7 +5025,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5046,7 +5046,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5067,7 +5067,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5091,7 +5091,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5112,7 +5112,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5133,7 +5133,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5221,7 +5221,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5246,7 +5246,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5271,7 +5271,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -5543,35 +5543,35 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 16
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 17
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 18
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 19
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
@@ -5972,35 +5972,35 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 16
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 17
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 18
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 19
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
@@ -6115,35 +6115,35 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 16
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 17
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 18
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 19
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
@@ -6830,35 +6830,35 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 16
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 17
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 18
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
   element {
     scale: 19
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1399
     }
   }
@@ -10661,7 +10661,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -10673,7 +10673,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -10685,7 +10685,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -10697,7 +10697,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -10709,7 +10709,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -10721,7 +10721,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -11791,18 +11791,12 @@ cont {
   name: "highway-bus_stop"
   element {
     scale: 16
-    lines {
-      width: 2
-      color: 0x888888
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus-mini"
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
@@ -11818,57 +11812,66 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 2
-      color: 0x888888
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus"
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
+    caption {
+      primary {
+        height: 11
+        color: 0x000000
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15031
+    }
   }
   element {
     scale: 18
-    lines {
-      width: 2
-      color: 0x888888
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus"
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
+    caption {
+      primary {
+        height: 11
+        color: 0x000000
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15031
+    }
   }
   element {
     scale: 19
-    lines {
-      width: 2
-      color: 0x888888
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus"
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
+    caption {
+      primary {
+        height: 11
+        color: 0x000000
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15031
+    }
   }
 }
 cont {
@@ -12019,7 +12022,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12033,7 +12036,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12047,7 +12050,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12069,7 +12072,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12091,7 +12094,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12113,7 +12116,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12138,7 +12141,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12152,7 +12155,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     lines {
@@ -12178,7 +12181,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12212,7 +12215,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12246,7 +12249,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12280,7 +12283,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12317,7 +12320,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12331,7 +12334,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12345,7 +12348,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12367,7 +12370,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12389,7 +12392,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12411,7 +12414,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12436,7 +12439,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12450,7 +12453,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12464,7 +12467,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12486,7 +12489,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12508,7 +12511,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12530,7 +12533,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12555,7 +12558,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
   }
@@ -12569,7 +12572,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     lines {
@@ -12599,7 +12602,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12637,7 +12640,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12675,7 +12678,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12713,7 +12716,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1042
     }
     path_text {
@@ -12754,7 +12757,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -12779,7 +12782,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -12792,7 +12795,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -12811,7 +12814,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -12824,7 +12827,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -12843,7 +12846,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -12856,7 +12859,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -12878,7 +12881,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -12903,7 +12906,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -12916,7 +12919,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -12935,7 +12938,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -12948,7 +12951,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -12967,7 +12970,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -12980,7 +12983,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -12995,105 +12998,105 @@ cont {
   element {
     scale: 0
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 1
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 2
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 3
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 4
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 5
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 6
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 7
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 8
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 9
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 10
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 11
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 12
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 13
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 14
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -13107,11 +13110,11 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -13126,7 +13129,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -13140,7 +13143,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13152,12 +13155,12 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13176,7 +13179,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13188,12 +13191,12 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13212,7 +13215,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13224,12 +13227,12 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -13251,7 +13254,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     lines {
@@ -13288,7 +13291,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13307,7 +13310,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13332,7 +13335,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13351,7 +13354,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13376,7 +13379,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13395,7 +13398,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -13423,7 +13426,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -13448,7 +13451,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13461,7 +13464,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13480,7 +13483,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13493,7 +13496,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13512,7 +13515,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13525,7 +13528,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -13547,7 +13550,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -13572,7 +13575,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13585,7 +13588,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13604,7 +13607,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13617,7 +13620,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13636,7 +13639,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13649,7 +13652,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -13671,7 +13674,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -13696,7 +13699,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13709,7 +13712,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13728,7 +13731,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13741,7 +13744,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13760,7 +13763,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13773,7 +13776,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -13795,7 +13798,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -13820,7 +13823,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13833,7 +13836,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13852,7 +13855,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13865,7 +13868,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13884,7 +13887,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13897,7 +13900,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -13919,7 +13922,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -13944,7 +13947,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13957,7 +13960,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -13976,7 +13979,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -13989,7 +13992,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14008,7 +14011,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14021,7 +14024,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -14043,7 +14046,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -14068,7 +14071,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14081,7 +14084,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14100,7 +14103,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14113,7 +14116,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14132,7 +14135,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14145,7 +14148,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -14167,7 +14170,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -14192,7 +14195,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14205,7 +14208,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14224,7 +14227,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14237,7 +14240,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14256,7 +14259,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14269,7 +14272,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -14291,7 +14294,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
   }
@@ -14316,7 +14319,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14329,7 +14332,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14348,7 +14351,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14361,7 +14364,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14380,7 +14383,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14393,7 +14396,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -14415,7 +14418,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     lines {
@@ -14456,7 +14459,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14475,7 +14478,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14504,7 +14507,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14523,7 +14526,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 3.0
@@ -14552,7 +14555,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -14571,7 +14574,7 @@ cont {
     }
     lines {
       width: 16.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       dashdot {
         dd: 1.0
         dd: 4.0
@@ -19313,7 +19316,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19335,7 +19338,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19363,7 +19366,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19391,7 +19394,7 @@ cont {
     }
     lines {
       width: 7.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19419,7 +19422,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19447,7 +19450,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19465,98 +19468,98 @@ cont {
   element {
     scale: 0
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 1
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 2
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 3
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 4
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 5
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 6
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 7
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 8
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 9
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 10
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 11
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 12
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
   element {
     scale: 13
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19570,7 +19573,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19582,7 +19585,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19596,7 +19599,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19608,7 +19611,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19622,7 +19625,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19634,7 +19637,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19648,7 +19651,7 @@ cont {
     }
     lines {
       width: 7.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19660,7 +19663,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19674,7 +19677,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19686,7 +19689,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19700,7 +19703,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19712,7 +19715,7 @@ cont {
       priority: 16034
     }
     area {
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1035
     }
   }
@@ -19729,7 +19732,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19751,7 +19754,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19791,7 +19794,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19831,7 +19834,7 @@ cont {
     }
     lines {
       width: 7.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19871,7 +19874,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19911,7 +19914,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19948,7 +19951,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -19970,7 +19973,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -20014,7 +20017,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -20058,7 +20061,7 @@ cont {
     }
     lines {
       width: 7.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -20102,7 +20105,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -20146,7 +20149,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 0xEEEEEE
+      color: 0xDDDDDD
       priority: 1034
     }
     path_text {
@@ -35981,7 +35984,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -35993,7 +35996,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36014,7 +36017,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36035,7 +36038,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36059,7 +36062,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -36071,7 +36074,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36092,7 +36095,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36113,7 +36116,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36137,7 +36140,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -36149,7 +36152,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36170,7 +36173,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36191,7 +36194,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36215,7 +36218,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -36227,7 +36230,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36248,7 +36251,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36269,7 +36272,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36293,7 +36296,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -36305,7 +36308,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36326,7 +36329,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36347,7 +36350,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36371,7 +36374,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -36383,7 +36386,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36404,7 +36407,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36425,7 +36428,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36449,7 +36452,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -36461,7 +36464,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36482,7 +36485,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -36503,7 +36506,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -40150,7 +40153,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40162,7 +40165,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40174,7 +40177,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40189,7 +40192,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40201,7 +40204,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40213,7 +40216,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40225,7 +40228,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40237,7 +40240,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40624,7 +40627,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40636,7 +40639,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40648,7 +40651,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40691,7 +40694,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40707,7 +40710,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40723,7 +40726,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40794,7 +40797,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40806,7 +40809,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -40818,7 +40821,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -41231,7 +41234,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -41243,7 +41246,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -41255,7 +41258,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -41641,7 +41644,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -41653,7 +41656,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -41665,7 +41668,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42002,7 +42005,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42014,7 +42017,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42026,7 +42029,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42179,7 +42182,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42200,7 +42203,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42221,7 +42224,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42242,7 +42245,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42263,7 +42266,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -42284,7 +42287,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43731,7 +43734,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43743,7 +43746,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43755,7 +43758,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43776,7 +43779,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43797,7 +43800,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43818,7 +43821,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43839,7 +43842,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -43860,7 +43863,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -48799,7 +48802,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -48811,7 +48814,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -48823,7 +48826,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -48835,7 +48838,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49608,7 +49611,7 @@ cont {
       priority: 16168
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15168
     }
@@ -49620,7 +49623,7 @@ cont {
       priority: 16168
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15168
     }
@@ -49641,7 +49644,7 @@ cont {
       priority: 16168
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15168
     }
@@ -49662,7 +49665,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49683,7 +49686,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49704,7 +49707,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49728,7 +49731,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49740,7 +49743,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49752,7 +49755,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -49764,7 +49767,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -54433,7 +54436,7 @@ cont {
       priority: 16168
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15168
     }
@@ -54445,7 +54448,7 @@ cont {
       priority: 16168
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15168
     }
@@ -54466,7 +54469,7 @@ cont {
       priority: 16179
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15179
     }
@@ -54487,7 +54490,7 @@ cont {
       priority: 16179
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15179
     }
@@ -54508,7 +54511,7 @@ cont {
       priority: 16179
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15179
     }
@@ -54529,7 +54532,7 @@ cont {
       priority: 16179
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15179
     }
@@ -54553,7 +54556,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54574,7 +54577,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54595,7 +54598,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54616,7 +54619,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54637,7 +54640,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54658,7 +54661,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54679,7 +54682,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54700,7 +54703,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54724,7 +54727,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54745,7 +54748,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54766,7 +54769,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54787,7 +54790,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54808,7 +54811,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54829,7 +54832,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54850,7 +54853,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54871,7 +54874,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54895,7 +54898,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54916,7 +54919,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54937,7 +54940,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54958,7 +54961,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -54979,7 +54982,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55000,7 +55003,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55021,7 +55024,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55042,7 +55045,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55066,7 +55069,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55087,7 +55090,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55108,7 +55111,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55129,7 +55132,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55150,7 +55153,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55171,7 +55174,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55192,7 +55195,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55213,7 +55216,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55237,7 +55240,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55258,7 +55261,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55279,7 +55282,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55300,7 +55303,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55321,7 +55324,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55342,7 +55345,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55363,7 +55366,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55384,7 +55387,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55408,7 +55411,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55429,7 +55432,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55450,7 +55453,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55471,7 +55474,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55492,7 +55495,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55513,7 +55516,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55534,7 +55537,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55555,7 +55558,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55579,7 +55582,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55600,7 +55603,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55621,7 +55624,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55642,7 +55645,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55663,7 +55666,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55684,7 +55687,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55705,7 +55708,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55726,7 +55729,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55750,7 +55753,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55771,7 +55774,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55792,7 +55795,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55813,7 +55816,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55834,7 +55837,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55855,7 +55858,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55876,7 +55879,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55897,7 +55900,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55921,7 +55924,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55942,7 +55945,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55963,7 +55966,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -55984,7 +55987,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56005,7 +56008,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56026,7 +56029,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56047,7 +56050,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56068,7 +56071,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56092,7 +56095,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56113,7 +56116,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56134,7 +56137,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56155,7 +56158,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56176,7 +56179,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56197,7 +56200,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56218,7 +56221,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56239,7 +56242,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56263,7 +56266,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56284,7 +56287,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56305,7 +56308,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56326,7 +56329,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56347,7 +56350,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56368,7 +56371,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56389,7 +56392,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56410,7 +56413,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56434,7 +56437,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56455,7 +56458,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56476,7 +56479,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56497,7 +56500,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56518,7 +56521,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56539,7 +56542,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56560,7 +56563,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56581,7 +56584,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56605,7 +56608,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56626,7 +56629,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56647,7 +56650,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56668,7 +56671,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56689,7 +56692,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56710,7 +56713,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56731,7 +56734,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56752,7 +56755,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56776,7 +56779,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 9
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56797,7 +56800,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 10
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56818,7 +56821,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 11
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56839,7 +56842,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56860,7 +56863,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56881,7 +56884,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56902,7 +56905,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -56923,7 +56926,7 @@ cont {
       priority: 19100
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 19000
     }
@@ -57271,7 +57274,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -57292,7 +57295,7 @@ cont {
       priority: 16031
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15031
     }
@@ -57313,7 +57316,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -57334,7 +57337,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -57355,7 +57358,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58162,7 +58165,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58183,7 +58186,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58204,7 +58207,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58228,7 +58231,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58240,7 +58243,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58261,7 +58264,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58282,7 +58285,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58345,7 +58348,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58357,7 +58360,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58378,7 +58381,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58399,7 +58402,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58423,7 +58426,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58444,7 +58447,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58465,7 +58468,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58489,7 +58492,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58510,7 +58513,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58531,7 +58534,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58594,7 +58597,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58606,7 +58609,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58627,7 +58630,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58648,7 +58651,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58711,7 +58714,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58723,7 +58726,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58744,7 +58747,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58765,7 +58768,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58867,7 +58870,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58879,7 +58882,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58900,7 +58903,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58921,7 +58924,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58945,7 +58948,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -58957,7 +58960,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58978,7 +58981,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -58999,7 +59002,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59030,7 +59033,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59051,7 +59054,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59072,7 +59075,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59096,7 +59099,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59117,7 +59120,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59138,7 +59141,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59162,7 +59165,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59183,7 +59186,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59204,7 +59207,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59345,7 +59348,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59357,7 +59360,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59378,7 +59381,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59399,7 +59402,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59501,7 +59504,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59513,7 +59516,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59534,7 +59537,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59555,7 +59558,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59579,7 +59582,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59591,7 +59594,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59612,7 +59615,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59633,7 +59636,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59735,7 +59738,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59756,7 +59759,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59777,7 +59780,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59801,7 +59804,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59813,7 +59816,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59834,7 +59837,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59855,7 +59858,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -59918,7 +59921,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59930,7 +59933,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59942,7 +59945,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59957,7 +59960,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59969,7 +59972,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59981,7 +59984,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -59996,7 +59999,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60008,7 +60011,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60020,7 +60023,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60035,7 +60038,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60047,7 +60050,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60059,7 +60062,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60074,7 +60077,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60086,7 +60089,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60098,7 +60101,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60113,7 +60116,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60125,7 +60128,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60137,7 +60140,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60152,7 +60155,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60164,7 +60167,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60176,7 +60179,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60191,7 +60194,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60203,7 +60206,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60215,7 +60218,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60230,7 +60233,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60242,7 +60245,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60254,7 +60257,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60269,7 +60272,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60281,7 +60284,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60293,7 +60296,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60308,7 +60311,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60320,7 +60323,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60332,7 +60335,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60347,7 +60350,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60359,7 +60362,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60371,7 +60374,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60386,7 +60389,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60398,7 +60401,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60410,7 +60413,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60425,7 +60428,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60437,7 +60440,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60449,7 +60452,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60464,7 +60467,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60476,7 +60479,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60488,7 +60491,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60503,7 +60506,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60515,7 +60518,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60527,7 +60530,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60542,7 +60545,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60554,7 +60557,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60566,7 +60569,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60581,7 +60584,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60593,7 +60596,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60605,7 +60608,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60620,7 +60623,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60632,7 +60635,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60644,7 +60647,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60665,7 +60668,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60686,7 +60689,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60710,7 +60713,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60722,7 +60725,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60734,7 +60737,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60755,7 +60758,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60776,7 +60779,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60881,7 +60884,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60893,7 +60896,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60905,7 +60908,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -60917,7 +60920,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60938,7 +60941,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -60959,7 +60962,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61022,7 +61025,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61034,7 +61037,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61055,7 +61058,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61076,7 +61079,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61100,7 +61103,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61112,7 +61115,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61133,7 +61136,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61154,7 +61157,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61178,7 +61181,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61190,7 +61193,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61211,7 +61214,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61232,7 +61235,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61256,7 +61259,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61277,7 +61280,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61298,7 +61301,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61322,7 +61325,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61343,7 +61346,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61364,7 +61367,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61388,7 +61391,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61409,7 +61412,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61430,7 +61433,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61454,7 +61457,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61466,7 +61469,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61487,7 +61490,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61508,7 +61511,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61532,7 +61535,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61544,7 +61547,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61565,7 +61568,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61586,7 +61589,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61610,7 +61613,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61631,7 +61634,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61652,7 +61655,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61676,7 +61679,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61688,7 +61691,7 @@ cont {
       priority: 16000
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15000
     }
@@ -61700,7 +61703,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61721,7 +61724,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
@@ -61742,7 +61745,7 @@ cont {
       priority: 16008
     }
     circle {
-      radius: 12
+      radius: 13
       color: 0xFFFFFF
       priority: 15008
     }
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index ebee24bbe1721190bd95cd8a7e673c0c44fc5a4b..800c7fd47c81be8b225b376fd81596fa3f34261e 100644
GIT binary patch
delta 241
zcmeB}&V7A4_lAe%5|0_V1Tr$yGs+Vyb(2bq<BLo33xv!#1Sa!Vm`)NDnSR)jNoKNv
zpg4q)3}rBFFKu34(Z0Nbar^QLrc<1Z8>SaEG4<A)atJE%aIu#ZCFTMRlxV2cQs(00
r;1RgH`YfZw|NsBlHMoS(_!2Wpg-khw$kQf_s!bS+b=wo0nbbW1R8&zx

delta 311
zcmcaUox5W?_lAe%I!73}1Tr$yGs+Vyb(2bq<BLo33xvEl1cZb*jltlty}*%8?^qS&
zEf^>NEH|xJ;1I+nr^La<4Ad_%zg9?rLx`XXVf-q%E;4b6z?_wwpI2N`RGM6pnV%=r
z{Gg)!K?URX2Ng^kI2jwJPi$i9O;Y6$RN~=cFDXjQ1^Ppxp;k+ni;sgx;O^?Pj1vF<
c|7X|Wl9*8{q{<;goHAhyW!pD2GpTz30A|EsF#rGn

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 07933c950f..4656f6ab5d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -9575,12 +9575,6 @@ cont {
   name: "highway-bus_stop"
   element {
     scale: 16
-    lines {
-      width: 0.6
-      color: 0xBB9944
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus-mini"
       priority: 16031
@@ -9603,42 +9597,69 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 0.6
-      color: 0xBB9944
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus"
       priority: 16031
     }
+    caption {
+      secondary {
+        height: 10
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      primary {
+        height: 11
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15031
+    }
   }
   element {
     scale: 18
-    lines {
-      width: 0.6
-      color: 0xBB9944
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus"
       priority: 16031
     }
+    caption {
+      secondary {
+        height: 10
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      primary {
+        height: 11
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15031
+    }
   }
   element {
     scale: 19
-    lines {
-      width: 0.6
-      color: 0xBB9944
-      priority: 31
-      cap: BUTTCAP
-    }
     symbol {
       name: "bus"
       priority: 16031
     }
+    caption {
+      secondary {
+        height: 10
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      primary {
+        height: 11
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15031
+    }
   }
 }
 cont {
@@ -51983,6 +52004,12 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 12
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
       primary {
         height: 12
         color: 0x3355DD
@@ -51999,6 +52026,12 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 12
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
       primary {
         height: 12
         color: 0x3355DD
@@ -52015,6 +52048,12 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 12
+        color: 0x3355DD
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
       primary {
         height: 12
         color: 0x3355DD
diff --git a/data/ink.mapcss b/data/ink.mapcss
index 2b201bd563..df3cb8a043 100644
--- a/data/ink.mapcss
+++ b/data/ink.mapcss
@@ -27,11 +27,6 @@ way::* {
     icon-height: 16;
 }
 
-*::int_name
-{
-  text-offset: 20;
-}
-
 node::* {
     text-anchor-vertical: top;
 }
@@ -67,7 +62,7 @@ area[natural],
 area[leisure],
 area[place],
 area[aeroway],
-area[tourism][tourism!=attraction],
+area[tourism],
 {
   fill-position: background;
 }
@@ -84,7 +79,8 @@ line[highway=track],
 line[highway=path],
 line[highway=steps],
 line[highway=cycleway],
-line[highway=construction]
+line[highway=construction],
+line[highway=bus_stop]
 {
     casing-width: 0;
 }
@@ -2547,7 +2543,7 @@ line|z15-16[man_made=cutline]
 }
 line|z15[highway=footway]
 {
-  color:    #e;
+  color:    #d;
   width:    1;
 }
 line|z15[highway=path]
@@ -3392,6 +3388,7 @@ node|z15[railway=tram_stop]
   text-color:   #3050d8;
   text-offset:  10;
 }
+
 area|z15-[amenity=fuel],
 node|z15-[amenity=fuel]
 {
@@ -3449,8 +3446,8 @@ line|z15[railway=funicular]::d1p3
   width:    0.5;
   z-index:  410;
 }
-node|z17-[highway=bus_stop],
-node|z16[railway=tram_stop]
+*|z17-[highway=bus_stop],
+*|z16[railway=tram_stop]
 {
   font-size:    11;
   text-halo-radius: 2;
@@ -4931,13 +4928,13 @@ line|z17[highway=footway]::d1p2
 {
   width:  4;
   z-index:  692;
-  color:  #e;
+  color:  #d;
   linecap:  butt;
   dashes: 1,3;
 }
 line|z17-[highway=footway]
 {
-  color:    #e;
+  color:    #d;
   width:    5;
 }
 
@@ -4945,7 +4942,7 @@ line|z18[highway=footway]::d1p2
 {
   width:    8;
   z-index:  692;
-  color:    #e;
+  color:    #d;
   linecap:  butt;
   dashes:   1,3;
 }
@@ -4960,7 +4957,7 @@ line|z19-[highway=footway]::d1p2
 {
   width:    16;
   z-index:  692;
-  color:    #e;
+  color:    #d;
   linecap:  butt;
   dashes:   1,4;
 }
@@ -6323,9 +6320,22 @@ node[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][
 area[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][natural!=peak]
 {
     symbol-shape: eval(cond(prop("icon-image"), "circle", ""));
-    symbol-size: 12;
+    symbol-size: 13;
     symbol-fill-color: #f; 
 } 
+node|z14[railway=station][transport=subway]
+{
+    symbol-size: 11;
+}
+node|z13[railway=station][transport=subway]
+{
+    symbol-size: 10;
+}
+node|z12[railway=station][transport=subway]
+{
+    symbol-size: 9;
+}
+
 
 *[highway]{color: white; text-color: black; text-halo-color: #f}
 area[area:highway]{fill-color: white}
@@ -6334,7 +6344,7 @@ area[area:highway]{fill-color: white}
 *[highway=pedestrian],
 *[highway=cycleway]
 {
-    color: #e;
+    color: #d;
 }
 
 *[highway][area?]
@@ -6348,5 +6358,5 @@ area|z15-[area:highway=pedestrian],
 area|z15-[area:highway=path],
 area|z15-[area:highway=steps]
 {
-    fill-color: #e;
+    fill-color: #d;
 }
\ No newline at end of file
diff --git a/data/normal.mapcss b/data/normal.mapcss
index 2330695634..b514ee028b 100644
--- a/data/normal.mapcss
+++ b/data/normal.mapcss
@@ -82,7 +82,8 @@ line[highway=track],
 line[highway=path],
 line[highway=steps],
 line[highway=cycleway],
-line[highway=construction]
+line[highway=construction],
+line[highway=bus_stop]
 {
     casing-width: 0;
 }
@@ -3233,6 +3234,16 @@ node|z17-[railway=tram_stop]
   text-offset:  10;
   text-halo-color:  white;
 }
+area|z17-[railway=tram_stop]::int_name,
+node|z17-[railway=tram_stop]::int_name
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+}
 line|z15[boundary=administrative][admin_level=7]
 {
   color:    #f9574b;
@@ -3870,8 +3881,8 @@ area|z15-[highway=pedestrian][area?]
 {
   fill-color:   #f0f0f0;
 }
-node|z17-[highway=bus_stop],
-node|z16[railway=tram_stop]
+*|z17-[highway=bus_stop],
+*|z16[railway=tram_stop]
 {
   font-size:    11;
   text-halo-radius: 2;
@@ -3881,8 +3892,8 @@ node|z16[railway=tram_stop]
   text-halo-color:  white;
   z-index: 20;
 }
-node|z17-[highway=bus_stop]::int_name,
-node|z16[railway=tram_stop]::int_name
+*|z17-[highway=bus_stop]::int_name,
+*|z16[railway=tram_stop]::int_name
 {
   font-size:  10;
   text-halo-radius: 2;